Nimh AA's are now up to 2400mah with 2600mah's right around the corner. At this rate, they'll eclipse a standard 2800mah alkaline AA battery in a few years.
Rather than make it a waterbottle battery again (which takes up a cage) why can't it be a long tube that you can velcro to the frame?