It sounds to me that you adjusted the G31 Z parameter to 18.64 after you had run auto calibration, instead of before. The firmware needs to know the Z probe trigger height during probing.
With a removable probe, your approach of adjusting the homes height afterwards is equally valid.