Stick a 1.7 puma lump in it if you're staying n/a?
Lighter lump so handling won't be affected as much, will produce the same power, and an easier conversion iirc.