Just a quick thought, has anyone replaced the washer bottle? It is a tight fit between the engine and battery and not the prettiest thing covered in heatproof material.
With the quality wipers I don't need much water so wondered if there was a small stainless or ally version that would fit easily?