You're ol lady is from Lutcher, i'm sure I probably know her lol...
What charger do you have? A123's will be an uprgrade over NimH as well. You can get a LiPo and charger from hobbycity.com for about $80 shipped...
Lipo Battery
Lipo Charger
Plus shipping will be about $75-80...