I think you used a multiplier for FI, it is an adder as well in SM. Personally, I think the NA weights are a little harsh, but you can make quite a bit of power even out of an NA rotary (though maybe not the best torque).
1.2 NA ..2200lbs
1.3 NA .. (1.3 + 1.8) * 200 + 1600 = 2220
1.3 Turbo ... (1.3 + 1.8 + 1.4) * 200 + 1600 = 2500
2.0 NA...(2.0 + 1.8) * 200 + 1600 = 2360
2.0 Turbo (2.0 + 1.8 + 1.4) * 200 = 2640
-Andy