Great looking truck.

What I would look to do if I was in a similar situation and wanted to retain a factory harness is to get an original harness and use it as a pattern for copying and making a new one. That way you can take your time to make it correct and you can keep driving your truck until you're ready to make the swap. This would also reduce the time your truck is down.