I think your assumptions are correct.

You already had a lager chunk of luck that the Failure did not take out your Engine.

Why take any more chances; fix it right.

On your Engine is the Fuel Injection Pump Timer attached directly to the Fuel Injection Pump?

__________________
84 300D, 82 Volvo 244Gl Diesel