What cells are you going to run? If you are sticking with nimh (to stay "legal") be sure to check the website of the manufacturer of your choice. Personally, I'd go for the GP3700. They are lighter than the higher capacity cells, and unless things have changed, they also have less internal resistance and will deliver more punch.