Both wont be ideal.

2.0zvh with a 1600 head and MFi manifold and management system...


The 1600 engine runs out of puff due to the head. Fitting a larger cc bottom end isnt going to help.

Be better fitting an EFi management system, at least you will get the most out of the engine.