using the Three-axis Touch Probeinstead of inaccurate stall homing, either on a fixed block or jig, or on the workpiece itself, and subsequently only relying on the workpiece coordinates.
If I were in your place, I would order a Three-axis Touch Probe to be able to achieve much better positioning repeatability this way.