when repairing the diesel pump do not let any regular shop with a dusty looking test unit repair it, you need a place that can accurately calibrate it in a dustless and airconditioned environment and adjust it on a certified and calibrated bench to factory specification.
The regular small time shops try to wing it and short cut their way forward - they even try to use razor blades as shims to adjust nozzle pressure - which is downright comical.
Such a place for Bosch pumps is the old DPS - I used their services a lot on old mercedes pumps and my own VW pump, every single time their result was nothing less than perfect. I then used the proper technique and tooling to mount the pump for accurate practice. That way I know what to look at when I dont get the desired result.