Just a couple of points on the lighting that you might consider....
If you are concerned about potholes and other road obstacles, I would suggest a light that is mounted on the bike down low so it casts more shadows across obstacles. Wearing a helmet light is not as effective because the shadows are much shallower. By low down, that can range from handlebars, to fork crown (my preference) to fork braze-ons.
This also allows you to look around without forward light disappearing like it would with a helmet light. By looking around, you are relaxing your neck and shoulder muscles, you are overall less tense because you don't have to concentrate on keeping your head ahead, and you won't suffer from tunnel vision.
I also have issues with helmet lights generally. On shared pathways, there is nothing worse than a rider with a helmet light looking at me -- as they invariably do -- and disturbing my night vision. I think the same applies to car drivers, and remember I might be a cyclist on the other side of the road that the driver's not going to see because of momentary glare blindness caused by a helmet light.
My experience is that with a quality light (I run a SON hub dynamo at Ovalplus light on my normal commuter/touring bike, and Cateye HL500-IIs on my go-fast bike) most drivers will dip their lights. Certainly, I find the Ovalplus with a 3W globe but very good optics, ensures that I can see and be seen in both urban and rural environments. And I never have to worry about batteries for headlights.
And, finally... whatever you get, get two of them (at least globes). Redundancy is a wonderful thing when batteries or globes give up.