Lights for night riding advice

Hello,
My S2 has a 12v conversion (not sure what sort as it was done when I bought it) and the lights all work sufficiently well to pass the MOT.
However the headlamp at night is absolutely atrocious, on the unlit country roads around my way I am reduced to pootling along in third as I can't see well enough to go any quicker, and that's pushing it! Dip points where it should and main beam creates more of a halo effect than a beam, ok if you want to look at low tree branches but no good for much else!
The speedo light seems brighter than the headlight and also when I apply the brake I get a short burst of brighter light for about a nano second.
I was thinking of adding a spotlight but in addition to this I think that there may be other improvements that could be made.
Has anyone got any experience similar that could point me in the right direction?
Thanks in advance.
My S2 has a 12v conversion (not sure what sort as it was done when I bought it) and the lights all work sufficiently well to pass the MOT.
However the headlamp at night is absolutely atrocious, on the unlit country roads around my way I am reduced to pootling along in third as I can't see well enough to go any quicker, and that's pushing it! Dip points where it should and main beam creates more of a halo effect than a beam, ok if you want to look at low tree branches but no good for much else!
The speedo light seems brighter than the headlight and also when I apply the brake I get a short burst of brighter light for about a nano second.
I was thinking of adding a spotlight but in addition to this I think that there may be other improvements that could be made.
Has anyone got any experience similar that could point me in the right direction?
Thanks in advance.