You might want to look for POWEREX MH-4AAI-BH in AA. Same type of battery as the Sanyo Eneloops and Uniross Hybrio batteries but with a storage capacity of 2400mAh instead of 2000mAh.