No, the G0 G53 Z0 is OK now.
You asked for separate settings per each probe mode, because you sometimes forgot to change some settings. Now on the setup page of the probe screen you have a "Separate settings per mode" checkbox. See your post: Probe functionality.