If night riding is scary for you, the consider fitting LED spots AS A START, since they will both light up the road, as well as keep you safer in traffic (due to better conspicuity/visibility).
Then, in tandem you can search for and add after-market specialist headlight, if you still need one...
For the modest outlay (say R1200 for two LED's), and for the low draw on the system (10w each vs 55w headlight), the results will be dramatic.
(disclaimer, we sell LED spots, but you can find them up in Jozi)
Cheers
Chris & Team
PS: I have the G450X, similar crap headlight, spots made a massive difference...