You've got the right idea. If you're planning for more power, and you've got the transmission openend up anyway, (assuming you've got the cash) go for the upgrades. I'm sure there will be others here to support you on your decision.
Derek
Scion xB 5-spd
Previous: 2000 Silver Frost SVT
Please share the road with cyclists.