Had the same problem on the F1, even replaced the switch, in the end I just put some tape over the light, when I rebuilt the bike I found a frayed wire under the engine, replaced it and it's been OK ever since. To remove it just take out the bolt and clip, and pull it out, no oil should follow it (mine didn't).
Cheers
Den