Makes interesting reading, all about the Bosch CP4 pump failures, seems the lack of lubrication from low sulphur fuel they have in the US, thankfully ours is classed as dirty so gets a bit more lube but muck could also cause cavitation and destroy the pump, interesting also that its not just a Jeep thing, the CP4 pump is used in many other engines, I suppose a filter on the return line would contain things to just the rack and injectors if the pump shat itself and save contaminating the whole system, Dencodiesel has CP4 pumps for just over aud$2,000 so add all the rest of the bits which on Rockauto all seem to be around the $600 an item mark so I think a match would be the best solution.
When I got my WK2 it had done 41,000Km and the fuel filters were really crappy and due for their first change at 40,000km, somebody must have forgotten, thankfully I don't trust people and checked everything, it will get my usual 20,000km change, maybe 10,000km after reading all this stuff..