As above, if you go forged internals you'll end up being nearer 2.1 anyway after machining.

I didn't think you wanted to bother with aftermarket ecu though?