I purchased a quality rewire kit with all the harnesses and connectors. Everything was well marked and fitted. That worked well for me (I do have custom wiring also).
don