I recently decided - with hopes of perhaps pulling off an EB this year - to upgrade my lights, since the EB (for me, at least) starts and may end in the dark. Since I purchased my last set (Light & Motion / Magic Shine) both bulb technology and battery life have come a long way. I was able to replace both my helmet light and my bar light with products with built-in batteries -- no more cables!
Here's the headlight, uses a Go Pro mount on my POC: https://www.outboundlighting.com/hangover/ 100g weight, runtime > 100 min
Here's the bar light, mounts with a solid rubber strap: https://lightandmotion.com/products/seca-comp-2000 216g weight, runtime of 90 min on high alone, way longer on med / low
Haven't tested them out on a night time ride yet, hope to do so once it cools off a little.