Orion also do LiPo packs that are shaped to fit where stick packs used to in a moulded chassis, have a look on JE Spares as I am not sure on prices.
Shame though, only a couple of weeks I threw around 15 packs of NiMh away (well took to the recycling point) as I thought nobody would ever have call for them again
