I knew your post rang a bell, but had to check back in my records, which concerned a vaguely similar problem I had with the indicator switch on my S1.
I started having rapid clicking noises after using the indicators, and after a while, the problem was there all the time. Seemed to go away for a period when I pulled the flasher unit and cleaned the contacts. Ended up pulling the indicator switch apart, and found wear in the switch contacts. Cleaned up as best as could, which sorted problem for a good year, but then problem back again. In all this time, the actual external flashing of the indicator lamps was exactly as it should be, so OK drive wise.
I was bemused when I tried to fathom out the Haynes wiring circuitry for the hazard lights, but can't blame Haynes - blame the french. Then by chance, checked the rear lights whilst the rapid clicking was going on, and noticed the rear wipers trying to move jerkily across the rear window.
Fed up by this stage, and knowing the indicator stalk switch on borrowed time, I replaced it with one from GSF, and - Bingo. Problems all sorted.
Hope yours is as simple, but not so long winded
