--I would love some recommendations for headlights as well, if anyone has any strong opinions.
I'd suggest the Hub dynamo , Wired head and tail light combination,
for the get on and ride lights
without regard for state of some battery charge amount,
even if you just bring the USB charge cable
to keep your Phone powered, plugging it in on the job .
My bikes have the German Schmidt hub, but shimano
has some lower cost hubs puts out the same 6v3w.