Re the tank leak, as it's at the top fuel pipe unions you might be able to clean and de-grease the unions and then coat them in resin, if that stops the leaking then encapsulating the whole union area is probably worth while, it could save buying a new unit, resin will mean you can't separate...