MkI headlamp switch problem

[mystery3]

So my headlamp switch has been acting a bit weird and is getting worse. Basically sometimes when I pull the switch the dash lights go on but the head lights do not, give it a little wiggle, they usually come on but once in a while if I hit a big bump or railroad tracks they will turn off or flicker. It's both lights, connections at the headlamps look good.

I'm basically wondering if I can open up the switch and clean the contacts or anything to avoid buying a new one?

Vehicle in question is a 1981 Caddy, late westy style switch I believe, pull type just left of the speedo.

[fatmobile]

 I've been relaying all of my headlight setups to avoid this.
 I didn't have any luck trying to clean the contacts on my Golf headlight switch.
 Maybe more luck with the MK1.

[8v-of-fury]

The are like $5 no??

Relaying may help.. But not if the power leaving the switch won't try on the headlights.. it won't kick the relay over either.

New switch. its probably original.

[mystery3]

They're like $25 but you're probably right.

With some parts a good cleaning is all that's needed and the cleaned/rebuilt oem one will outlast the aftermarket stuff so I was hoping.