in all honesty the management is the problem, the 1.8 has a longer stoke than a 1600 and consequently the map will be quite different.
you need to get it on rollers and the ecu chipped to suit.
i'm using megasquirt on a zvh and i tried an rst map and had the same problems.