Matt,

I've been using Nimh from CheapBatteryPacks. He doesn't always have what you might want, but can put it together any way you want when he does.

You might also want to call Doug (Afterburner1). He has a place local where he gets some nice Sanyo NIMH packs made.

Rick