Have you thought about buying LiPo batteries?

A 2S 1500 mAh pack could probably fit where the 7 cell pack goes and it will be lighter and give you more air time per charge. Small LiPo specific chargers do not cost much, but the batteries themselves are more expensive than Nickel batteries.