I would go with the 9XL and 4s lipo combo. To tame wheelie's or get rid of them all together do the following....

Run the 3.3 extended chassis on your revo.
Use high gearing
Use a some what loose slipper clutch setting
Reduce punch or startup on your esc to tame power from a stand still
Use a techno RC eletric clutch on your motor instead of a pinion
Move your battery as far forward as possible

BTW the zippy-H lipo's are nice, the zippy-R lipo's are even nicer for just a few bucks more but they are long & skinny packs so make sure they will fit on your truck. The zippy-H are normal length packs though.