I squirted the switch with some switch cleaner and took it out for a run yesterday. The indicator only worked intermittently again. Contacted the dealer today and I'm just inside the warranty, it expires on Sunday. I'm taking it in for them to have a look at it on Thursday next week, the dealer did want to keep it for a while to repair it but at the moment I'm using it a lot. If new parts are required then he'll order them and get it back in for a repair. Hopefully that's it sorted.