Well, nearly a year later, an update, FWIW.
I've spent the last year driving the car, changing the fuel filter every 3 months or so and just driving it slow, with less acceleration.
I haven't yet replaced the tanks, but am in the process of ordering parts, as I am going to replace both the fuel...