Have you considered a v7 or v8 JDM 2L swap? The v7 motor is pretty good, with forged pistons and such, revs nice and high (isn't it 8500 redline?), and has some pretty good heads too.

If you're getting a motor built, consider having the piston tops and combustion chambers ceramic coated. Really helps prevent detonation and protect against high egts damaging parts (not that you'd want really high egts).