it wil be the switch for sure they go all green inside the switchs are cheap only about a tenner.or like bb says you can clean it up maybe if you undo the clock brackets with the two 10mm hex headed bolts from under the top yoke then turn the clocks over you will see the only thing that holds the switch in is two tags either side of the black plastic part of the switch itself, now you may have to take the headlight rim off and disconnect the wires from the switch there is about 4 wires i think red/black/black and white and i cant remember the last colour :).anyway undo pull the wires apart and then you can push the two tags in and the switch will push out the key end goes up,then you will see that the bottom of the switch is held on by 3 little tags that sit in 3 very small rectangular slots push them out and the bottom part of the switch will come off.you will be able to see if its shitty in there i would clean it with some fine wet and dry and then put a little bit of grease on the contacts there will be about 7 little copper dots and the other side of the switch will have 2 rocking srung loaded bridges clean them all up and put it back together and you might get a bit more use out of it.but its alot easier to buy a new one really.good luck with that
adam bike doctor, January 2010