At least it wasn't the pump itself causing the surging, just it's supply.
So long as you can solder it is easy to replace the three multi plugs, the 2wd doesn't use these to start with, soldering is not hard to master, and in your location you have access to one of the best solder fluxes you can have/use, PINE TREE RESIN, this cleans wires beautifully, just scrape some off a tree, use this as the flux when soldering.
There's how to's on here re the fuel pump rewire(pf) you are talking to do all the pump rewire, fan rewire(if not already done) and the multi connectors soldered about £50, and that includes a decent soldering iron and loads of spare wire left over.
When I rewired my pump, I used a relay holder, about £3 to mount the new relay behind the seat upright on the nearside inside the boot, there is already a 8mm hole so ideal for a 6mm nut/bolt to hold there, this has several advantages, security, at shows etc simply pull out the relay, to stop fuel pump, if having any trouble you can simply bridge 30(input from battery via fuse) to 87(output to pump) so it will run all the time, very useful for diagnostic work etc, or if relay packs up you're not stranded.
A pump rewire kit is typically £45 on it's own, and a 2 year old could do it tbh, the last kit I fitted was not even fused at the battery, despite being a so called "proper" loom, some wires were way too short, others way too long.
tabetha