I've considered A123s, but for me, I'd have to buy the charger too. Coupled with a 2s2p pack, I'd be far beyond broke at the moment... Oh well...

The lipo I have now isn't puffed at all, so I think it'll hang on in there. I'll try drilling the case for some cooling holes (without the lipo in there of course) and see if that helps.