CLIPPER LIGHT SWITCH HELP!ANY DECENT REPLACEMENTS AVAILABLE

and now the headlight switch is on the blink,the lights going on and off at random/when i go over bumps.as i work nights this is just an invitation to getting nicked on the way there or back, not to mention a pain in the backside anyway.
are there any decent replacements that arent full of all those stupid little brass bits,that are obviously worn out as this is prob the switch that the car
left the assembly line with.
D reg (86?) 1.8 Clipper

any tips/hints very much appreciated - mot time in 2 weeks just to add to the
joy.

btw have to say dont have much faith in my local VW dealers (Whites in Morden,Surrey - be warned) theyve sold me wrong parts before.they dont care about the few quid i want to spend on my old banger they more interested in selling a cr*p new Beetle to a "yummy mummy".

Try a new headlight switch, can be bought from ebay for about ?8

Check all the connections to and from the lights in the engine bay as well!

You can open the switch up and see why its playing up.....check the spring location and the ball bearing inside it....

Some electrical contact cleaner might do the trick mate.

T