This weekends job was to fix the muntjac damage, as well as a leaking headlamp washer and a condensate'd headlamp. All jobs that require the bumper to be removed anyway. The headlamp was removed and 'drained' of water and dried out indoors - you can see the design flaw here as the large amounts of water in the recent deluge, has made it's way past the wheel arch liner 'headlamp lamp change access cover' and onto the back of the headlamp, where it pools in a recess, eventually seeping into the lamp as the seals get old and brittle.
I've dried this out, and polished the projector lens at the same time as they go misty with dust. I stuck some bike grease on the headlamp access cover seal and made a temporary seal (duct tape) over the wheel arch access cover to stop that happening in future wet weather.
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.
Reasonably satisfying