Minimum headspace is limited by contact between the bearing surface in the center of the extractor and the recoil shield. It shouldn't factor into your calculations and unless it has been improperly modified, shouldn't be a problem. Endshake should be as close to zero as possible while maintaining a free-turning cylinder. I'd recommend you correct the endshake by having the crane stretched. Shims are okay as a temporary fix but are not a good long term solution, especially when you are looking at multiple shims. If your numbers are correct, correcting the endshake is going to result in a large, probably excessive, cylinder gap. .010" is generally considered maximum. That will require that the barrel be set back.