Finally did a replacement which was on my list for a long time. I replaced the old fuel pump with a new unit from Meat&Doria.
I needed to wait for the Fuel Ring Locking Ring Tool before I was able to continue as the rings (2!) sit very tight.
Car feels like new again!