If you go with the 02, then IMHO, I'd plan on a TC change. And keep in mind, the higher the cam duration and stall speed, the more that it can adversely impact fuel mileage. That may or may not be important to you.
Guys tend to go with bigger cams, but it's not always better.
