If you're serious about cordless tools, move over to Li-Ion batteries. I have a Hitachi drill/driver that I'm very satisfied with. No self-discharge, fast recharge, high torque. I use this thing professionally nearly every day in a home repair business, doing simple drilling, mixing paint, installing cement board, building decks. If I'm using it hard, the battery overheats before it discharges, so that can be a problem where having three or four instead of just two batteries would be nice.
Ryobi has a direct swap of their NiCd batteries to Li-Ion batteries -- same form factor for the battery stem. I just wish that Ryobi tools didn't suck to the nth degree. I own six Ryobi power tools and only one has yet to prematurely fail -- and that's probably because I've only used it twice.
Home Depot's Ridgid line has an interesting deal -- the products are warranted for life, free parts and labor to repair -- AND THAT INCLUDES BATTERIES ON CORDLESS TOOLS. I don't own any Ridgid power tools other than a shop vacuum (I like it) so can't tell you anything about reliability, etc. But that warranty is sure attractive and it'll probably be the next brand I try.
Dean