If you are thinking of an upgrade go for the 2.0 block just because of the potential power increase,
You will need to take the engine, loom/ecu and sensors and mountings then attach a erst gearbox and a decent clutch, a set of cvh drive shafts and a few bits and bobs.

I'm not to clued up on the n/a conversion but i'm sure there are different ecu's, your best getting advice from some of the other users.

You should see 150bhp out of a n/a engine and a fair amount of torque