sub-d....Im kinda in same boat(need bigger & better charger) Lots of guys swear by those CellPros...lil pricey, though you might not need another one....ever.
http://www.quantumhobby.com/FMA-Cell...40A-EC5-MC.htm
but been looking at this one......
http://www.valuehobby.com/power-syst...e-charger.html
not bad for $90 + shipping
cr