Really, I would suggest you to go for an ST2 engine replace...
By the way, if you wanna go through the upgrade, I believe someone in this board has done it succesfully. He can suggest you a good workshop in the States as well.
Besides the cc increment, I suggest to find ST2 cams, which deliver more hps and torque to my knowledge.
Good work,
Tino