Finally, finally I got the Pan back today. Amazing how much the brakes improve if the disc runout is within spec... Of course it would've been even more spectacular if the bod at the garage had made a note of the fact that the front brake doesn't trigger the brakelight any more and thus changed the switch like I asked him to. Oh well, mustn't grumble, it's only taken four weeks.