Ok, 1st make sure you are using the DEV version of firmware, many probing improvements have been made in this version.
2nd, if you use homing option
Z up, X,Y preheat Z
or
X,Y preheat Z,
#define HOMING_ORDER HOME_ORDER_XYTZ
it should then use the ZHOME coords