So, seems to me the shut off valve is shot, why not just replace it? Then the car will start and shut off correctly.

__________________
1983 W123 300TD US spec Turbo engine, with Euro bumpers and manual climate control, and manual transmission.