I have found this battery pack fits into my pool blaster max. It has 9.6 V out but a much higher energy density.
http://www.all-battery.com/96v4500mahnimhbatterypack11431.aspx
It drives the motor and recharges and includes the correct connector as well. I cut off the foam from the old...