There are loads of decent options depending on your budget, brand allegiance etc.
The £30 ish XML bastid lights are amazing value and have plenty of light, if lacking a little in spread. I've had mine for a year with no problems mounted to my helmet and it is great.
If you are worried about warranty on above light then MTB batteries buys you peace of mind at twice the price.
All the magic shine lights seem good but aren't without problems.
Hope and Exposure lights are fantastic, are British and have bombproof reliability backed up with bombproof aftersales service that goes well beyond any statutory obligation. A mates 4 year old Hope4 went back with an iffy battery and came back free of chagre with need battery and leads 3 days later. Similar thing happened with a mates Joystick with Exposure.
I'd recommend either a Hope R4 or a similar priced Exposure light for the bars and a cheap £30 XML lamp for your lid.