I was recently inspired to try and improve my headlight. Didn't succeed, but thought my experience might be useful to share. The deflector inside my original shell came loose some years back, and though I've been able to wire it back in the sort of vicinity of its proper location, the output and pattern is silly poor.
I tried a 7" Grote sealed beam from Summit Racing (https://www.summitracing.com/parts/gte-90941-5), hoping it could be adapted without too much fuss. I found that some fuss would been needed. I may eventually go that route, if I can convince an engineer buddy to design and 3D print an adapter. In the meanwhile, I'll be sticking to daylight riding. I would be happy to hear of a source for a fully intact OEM unit.