with the engine swap you need to find someone that is not familiar with corollas. because as far as they know a 4a is a 4a. i also think there is a clause in the vic roads rwc thing that says it's all ok if it was offered as an option at the time of sale. don't quote me on that one but my tester didn't even blink when i want from a 3k to a 4k. it may also help to have it look standard, so hold off on the itb kit and extractors till after you get the engine number changed.