Decided it was time to junk the knackered left hand switch gear. The bike's not road legal so I was only using the kill switch. Also, the switch block was interfering with the movement of the clutch lever.
I've replaced it with a simple Kill Switch and wired the headlight so it's permanently on high beam.
Switch.jpg
.
.
.
Much neater...
Kill Switch.jpg