I would also go with P7 flashlights.. I use 2 of them for my night rides.. Normally I just keep 1 on, but I have a few very dark spots and turn the 2nd one on, really lights up the road.

3000mah Ultrafires on ebay.. Just received this last week and they are solid batteries.. Ran a test and easily got 20 minutes more over 2400 mah 18650 batteries.. Seller was quick to ship and was here in 7 business days.. They also sell 4 packs with cases too..

http://cgi.ebay.com/ws/eBayISAPI.dll...m=220362820486