A few suggestions.
In 'movement'
Use homing order with a pre heat option as this allows you to specify the X Y coords to home Z and also raise Z before probing.
#define HOMING_ORDER HOME_ORDER_XYTZ
#define ZHOME_X_POS 0
#define ZHOME_Y_POS 0
Also set pre raise so that Z is raised befor homing X Y
#define ZHOME_PRE_RAISE 2
#define ZHOME_PRE_RAISE_DISTANCE 5
In 'Z Probing'
Increase the switching distance to make sure probe untriggers
#define Z_PROBE_SWITCHING_DISTANCE 5
Set the Z_Probe height to a realistic value or you will drive the nozzle into the bed
#define Z_PROBE_HEIGHT 1.2
Hope this helps.