Thanks Ken - I'm currently trying to source the original female connector blocks they are 6, 8 & 9 block units - I'm using the carrot of buying a main loom as an incentive!
Waiting for replies from Electrex World & Kojaycat in reserve I have a firm who make bespoke stuff (sounds pricey).
Might have sorted the Pilot light loom courtesy of some bulb holders from a member here.