One thing you have not not elaborated on, is what are your power goals for now, and estimated future goals. No sence in doing things 2x. Under 500whp, go with the 7m. Anything over that, look towards the 2jz.
BTW doward, way to shit on us 1jz guys ;) You also forgot the oiling system, as...