Not the exact revision, but I had a closely related setup with the same general failure mode. The thing that saved time was separating the Niche Zero / puck-prep side from the machine side instead of adjusting both together. Similar experience, not proof for your unit.