Well, after extensive measurements, the block I have isn't going to be usable. Piston to block clearance is far over the upper limit of the spec. I guess now I make a table out of it?
So I got this. A low-mileage, stock bore M54B30 block. Machine work starts on Wednesday.