Just got the Roadster back after a six week wait!
At least it now has the correct master cylinder fitted. Great to have it on the road again.
Many thanks to all those who sent their helpful suggestions.