The headlamp washer leak (it was draining the reservoir over night) looks like it's the 'o' ring on the quick release hose fitting to the jet assembly, so I've found a replacement 'o' ring and resealed it. If it leaks again then I'll just blank it as the washer does little washing anyway. The bumper just pops back in to the wing clips, which I've repaired.