Update
After cleaning all connectors and earth points the problem persists.
So tomorrow the dealer is asking the factory for availability, and cost, of a new Speedometer.
We think it's just a straight replacement that I can fit myself before we head to Spain 1st June, but it means the mileage will be incorrect.
Just hope that when fitted it fixes the problem.
Will update again hopefully a few days into our tour.
Fingers Crossed