Dodgy Neutral Light

have any of you had a sticky neutral light? I can eventually get it to light up but only after jiggling the gearlever about. seems the switch down in the gearbox is sticky/knackered. its an 07 if that makes any odds. any advice on fixing this other than go get it warrantied. anyone else had leaky clocks. im on my third set now. get this the ktm uk tech guy says i shouldnt even use a hose pipe near them. am i supposed to wash the bike with a watering can. dont think so!!!
any advice on the neatral switch appreciated.
cheers