Got the parts from YnZ. Worked great. Their 1/4" wire loom is extremely close to the OEM. Getting the harness apart is a bit tricky to sleeve it on. Here are some pics of the first harness. Perfect.. no, but a far sight better than the frayed, exposed-wire state it was in.
Loom comparison
New sockets. The big improvement, no more corroded tips and missing springs causing bad connections.
Soldered tips
Newly wrapped, needs a bit more work and looking to make a new white FoMoCo/Part # tape wrap to add a finishing touch.