Edward Scissorhands - HACK JOB!!

I'm convinced that one of the previous owners of my '71 Demon 340 was Edward Scissorhands, just check out the wiring whack and hack job on the insturment cluster! I especially like the 2 wires soldered directly to the printed circuit board!! I don't know what happened to the pigtail for the headlight switch? Anyway, there's no way I'm gonna pay $549.00 for a reproduction dash harness, I've already restored the engine bay harness, it was just as bad as this. Does anybody know if I can buy the pigtail or hardshell for the headlight switch? I also need a handfull of the small single wire connectors pictured and a firewall bulkhead connector or harshell would be nice, but not an absolute necessity.

MVC-007S.JPG

MVC-008S.JPG

MVC-009S.JPG

MVC-010S.JPG

MVC-011S.JPG