Nice work! Glad to hear it's sorted. Thanks for posting back the outcome. It's always good to have these threads closed out with a solution for those that stumble across them in the future.

Yeah it's a good thing you have sorted out the wiring at the same time. It's one of those things that could potentially leave you stranded if there's an intermittent short. The potential is even worse for anything fuelling related if it's causing a sustained lean condition.

Have fun with the car now that it's back on the road.