Brighter headlight options for old M900?

I have an early M900 Monster. She has very low mileage and in fantastic condition, and having recently decided to hold onto her indefinitely I'm starting to treat her to some TLC.

One of the things I like least about the bike is the very substandard headlight. is there a quick and easy solution to this such as a bulb change? The old glass is also looking quite yellowed, but unsure if this is an age issue or just how they are without having anything to compare with?

I want to keep the bike as standard as possible so not really keen on swapping out for entire new/different units.

Thanks,

Ed