Thanks for the recommendations and advice everybody!

I still have a Lezyne Mega Drive on my handlebars right now.
And I have a Blackburn 2'fer on my helmet. Long term loan from
my brother; but as you can imagine from it's size -it's very weak.
So I'm not in a rush to get a new light right away.
Brooklyn Bike Rave by 1nterceptor, on Flickr
I just clipped one of my smaller flashlights to the Niterider Lumina
helmet mount. Just a temporary fix/experiment. Olight S1R Baton uses a
unique charging system; end of USB plug attaches to light with a magnetic tip.
Didn't get a chance to ride with it yet:
Olight S1R on Lazer 02 by 1nterceptor, on Flickr