RE: Battery upgrade
If you are satisfied with the speed you are achieving currently, why increase to 7 cell packs?
You may as well just go LiPo to save yourself money in the long run and headaches.
Increasing mAh should reduce heat and increase run time and / or performance. This is very true with LiPo but not always true with NiMh.
Ryan