I use this and am very happy with it:

http://www.dealextreme.com/p/ultrafi...2-cr123a-20333

I get well over an hour's runtime per charge. In fact, I've never had it go out on me. It may dim but I haven't noticed. I recharge it about every third ride.