No way in heck would I ever put a stock style wiring harness back on a Mopar. I tell you what I did. I was just stumblin through the clearance and garage sale stuff on Speedway Motors one night and found a 21 circuit harness for my rat truck normally 399 bucks for 89 bucks. I thought it was a mistake, but I ordered it anyway. To my astonishment, it arrived a few days later. Each individual wire is marked accordingly. Yes, it uses GM colors, but so what? They are pretty much universal in the wiring world anyway. Anybody that's ever worked on cars any time at all knows red is batt, pink is ignition, purple is starter. Simple. Plus NO firewall connector. You simply run the wires through a grommet.
The only word of caution I give is this. Don't cut the length on anything until you have run each individual harness exactly and I mean EXACTLY as it will run in the as finished position and you are ready to terminate RIGHT THEN. And even then, cut LONG. I even coil some wire up and zip tie it up out of the way before I cut to length, because you never know what might happen later. That way, you always have extra wire in the event you need it.