Some more bits and pieces have arrived. I ordered a set of rubber wiring plugs and covers for the outer headlights. I also got the correct black rubber drain hose for the scuttle under the windscreen.
The headlight rubber bits are now surplus however, as a pair of NOS outer headlights complete turned up. Complete with RHD lenses, brand new buckets, seals, wiring, and the rubber plugs and covers. Not cheap but very very nice.