Fitted new pump today £87 off ebay (new ones are ~£900).
Repeatedly flushed it out and rotated by hand while putting clean diesel in until sure any possible bits would be out of it (as they never get the holes sealed by the sellers). Replaced fuel filter and the valve on top (which snapped when removing) and vacuumed diesel from all 4 pipes on the filter in case they had bits in them.
Not that hard having had it off before a few weeks ago.
Don't need to put into service position like the manual says but had to cut threaded shaft of pulley puller tool down to fit the smaller gap.
Been for a test and back to normal service and may get old one refurbed.
Now 12-13 years old it seems lots of parts made of rubber or plastic have deterioated in strength, such as connectors, pipes, clips etc...
Attachment 18788
Attachment 18789
Attachment 18790
Attachment 18791