Some very nice touches there mate, looking good so far! I'll see it on Sunday at York Raceway won't I? Looking forward to it! Also, where did you get that battery relocation kit from?
There are a few people carrying out the 2.0 conversion, but its not cheap or easy. The 4EFTE is available for about £450, theres one round my way for that much actually. Its got alot on potential, and you can get 200bhp quite easily!
The easiest engine to stick in a N/A is the 4EFTE which is originally found in the Starlet GT and Glanza. Comes stock with £133bhp. (1332cc Turbocharged)