From what has been described here, it seems that the problem is definitely associated with the sidestand switch.
Although I haven't yet had a chance to check, once I've identified the switch, I'll attempt to take it out (if possible) and clean before considering replacement.
Incidentally, should...