Fitted the new master today and all is well. Got to go for a test ride but the action already feels loads better and the brake light switch is now not sticking on. Dead easy to fit as well. Just a straight swap and no need to bleed as the pressure came straight up on the lever as I filled the master and gently pumped away.
