Using a docking probe with PROBE_CALIBRATE

I have a Switchwire with a docking magprobe on a servo arm. It kinda works with a relative reference on the mesh so long as I ONLY print at one temperature with one bed surface type without recalibrating my Z-offset.

Using no relative reference index I can swap beds and deal with different temperatures and get a consistently good first layer so this looks like the way to go, but PROBE_CALIBRATE needs me to manually remove the probe, not the end of the world, but I need to fiddle about with the servo to get the probe back in position which is annoying as hell.

Is there a way to alter probe_calibrate so it gets the probe out and puts the probe away again during the process?

You need to create a macro and use the rename existing option so it loads the probe before, and docks the probe after. Take a look at all the configuration files for klicky to see how this is done.