I worked it out to keep the 606 lift pump as follows. I agree that Goran selected this for a reason and it made sense to keep it.
I DID solve the lift pump screw-up thanks to our local Diesel injection guys, Diesel Parts. After a false start I took the lift pump off and took it over to them and they came up with a slightly earlier version of the fuel return fitting that I screwed up. Here come the pics:
The replacement fitting and the place it lives.
The pump reassembled and ready to bolt back in.
Back in the hole and plumbed!
And the oil lines back in place and the oil pressure sender back in the loop.
Another one of those jobs that took stupidly longer than it should have. But now I can reassemble the rest of this mess.
Dan