Instrument Cluster Circuit Board Fix

That's a good idea. I had searched for a pin to replace the stock ones that had a connector on one end, and I was going to connect each wire separately.
The wires, other than the ones for the lights, could be connected directly to the stud/nut.
If I could think of a way to connect to the lights w/o the pins that would be nice.
Your after market connector must be in a better location too, easier to reach I would imagine.