I've decided to crimp on new pins as the easiest way of getting a neat result.  I've used 10mm heat shrink (CC do supply a length of heat shrink on the wires), and bound the four headlight wires together and then added the indicator wire - applied heat, cut down a grommet (not too happy about having to cut it) and threaded the wires through the grommet and then down the head light mount.  That happened in a matter of minutes.  Getting the grommet to locate took some time, but keep it warm and gently poke at it with a blunt end and it does locate.  I tried different rotations of the grommet, and eventually it located itself.

The wires then passed through another grommet in the upper wishbone mount (again easily) and the tab on the bottom of the headlight mount was located - holes were aligned and the bolt slid in.