For the front, get a magicshine clone like this one:

http://www.amazon.com/Cycling-Bicycl...cle+head+light

I have a real magic shine and a faux magic shine and they're pretty similar (build quality is a little better on the real one, and the connectors are much more solid but both work very well). Neither of them mode skip like my flashlights did. I thought the external battery packs would bug me but I just strap them to the back of the head tube or bottom of the top tube, no worries.

Another vote for the cygolite hotshot.

If you're worried about batteries running out mid-ride, get two of everything (certainly a good idea)