Just a quick up update, I have had both washers replaced. Body shop swapped them when the front end was being sprayed. I took the plunge and just got the parts from BMW. Leak has stopped and the car is working perfectly. Just in time for Scottish winter.
