New Pete 388/389 headlights.

[ZeroNthedark]

I guess there isn't a good solution, or at least an all-in-one package.

I've been thinking about getting some of these to act as a modified driving light (or on their own switch):

http://www.ebay.com/itm/162709665897