Cheers Dappers, I believe the switch is the same for Mk1 and Mk2 all the way from 1991-2001. I know its different from the 9er.
I'll have another look Pantboy, I spoke to Rob (Rsrocket) who had the bike before Lester (Ninja), and he had the same problem as it failed an MOT on it. He bent the arm forward a bit and it had been fine since. The plunger as far as I can see isnt sticking, because if it was, wouldn't the light be stuck on??
Just hadda look at you linky dink dappers, its my front brake light switch thats dicky!!!