I am with these guys, leave it alone.... and I recommend also saving money.

However, I do not recommend swapping in a different engine. The D can make pretty much as much power as you want for legal street use, and you will have a lot less money in building it and turboing, than if you swapped in an H22 or B18, built and turboed.

[/favorable turbod16rant]