Well, what I did today was kicked myself for being a D2 owner. I'm now shopping for a short block.
As luck would have it, the 2018 Western National Land Rover Rally rig is in need of a new engine. Why is that you might ask -- wasn't it a rebuilt engine? Very good questions for which I have no answers. What I do know is that I've got a lot of shop time into a bad engine block (so that's going to be a few grand), have machined heads, and am in need of a short block. Please let me know if you have any leads. . . .