Quick update...bike has been absolutely fine since it came back from the dealer so whatever 'cleaning and checking' they did seems to have fixed the problem - for now anyway.
Got to put a new rear tyre on very soon, that's another £300 gone

At least I'll have good rubber for the summer