Check Ebay - I bought an 8 cell pac made from Sanyo 2300s (at that time, they are prob bigger now) when I wanted to get away from that stock NiCd pac.

Know you said not ready for lipo, but thats what I've done and it was worth the expense. It was a bigger improvement than stepping from the NiCd pac to the Sanyos.