Fuel pump changed - so damn quiet now. 040 bliss
Surprisingly the part that should have been easy; pulling the plastic retaining collar off, was a prick and required a $40 wrench (no getting that off by hand - still needed a heap of force on my long ratchet). And the part that took me 2 hours last time I changed the pump; trying to hook the fkin pump arm onto the bracket, was done in about 5 minutes.
Fuel hoses in the tank were splitting near the hose clamps, within the nipple and still airtight so should be okay, but might need a longer term solution for that. Alas Pirtek aren't open at 9pm.