I'd take a look at the 3800 swap if i were you, you'll have a bit more room to work with, it fits great and if you get the supercharged version you'll have plenty of power also.