A new harness would work fine, except it still has the rotten routing for power to your headlights.
I'd look for a good used one for low dollars and relay kit the headlights. Since you have to spend either time or money to fix that rats nest you have.
