One word of advice is be careful when returning fuel to different tanks than where it is being drawn from, some engines use the return fuel to cool fuel system, thus returning large volumes of fuel.
Depending on engine types, I have had it where people have emptied tanks and run out of fuel from one tank, but either filled another or the bilges all on returned fuel.
Can be a problem when there are lots of valves that can be played with!
Sounds like you may have it covered with a numpty repair job/ bodge being the problem!
All looking good Mike great effort team Fox, good luck with the trials and boat going forward.