I had no problems running 480cc VXR's on a 1.6 RST, should be fine on a 2.1
Looking at your map Geoff i'd turn the required fuel setting down to around 3.5 (currently at 7.3) and that should give you the resolution you need.
It's under Basic Setting, Engine Constants in Tuner Studio.