How to Modify Probe Test Routine

Hello,
I recently added a Z switch to my plasma table so that I could properly home my Z axis.  I set my home offset 1 inch from my home switch which is located at the top of travel for my torch.  So when Z is homed, it is up and away before X and Y move to their axis home.  
When I move my torch into position I now find myself using the Probe Test button to align the torch to my material.  The torch now moves a good 12 inches down, touches the material, and then moves all the way back to home position up top.  How can I make the torch move to 1 inch above the material after probing instead of it going back to its home position?   
Thanks!

Home offset is the home switch position, home is where it moves to after tripping the home switch.
linuxcnc.org/docs/devel/html/config/ini-homing.html

I am using QTPlasmaC on 2.9.  

I am trying to change the final location after a probe test.  Instead of Z returning to its home position after probing, I'd like it to retract 1 inch above the material it just probed.

 

Probe test returns to the Z position it was at when the probe test button was pressed.

This is where I've gotten:
I call a subroutine from a new button, rapid down to z-5.0, turn on M66 to read the input of my float head switch, start a while loop to slowly go to z-6.0, then check the float head switch again, once the while loop is false go to z-1.0.  The problem is the G01 Z-6.0 F10 call inside the while loop needs to complete before it will check the float switch again.  Any suggestions on how to slowly move the torch down and have the M66 return value #5399 actually interrupt the motion?
%
O<goDown>SUB
G00 G90 G53 Z-5.0
M66 P0 L0 Q1
O<goDown-while> WHILE [#5399 EQ 0]
     G01 Z-6.0 F10
     M66 P0 L0 Q1
O<goDown-while> ENDWHILE
G00 G90 G53 Z-1.0
O<goDown>ENDSUB
M2
%

You could possibly use the LinuxCNC motion.probe-input and utilise the standard gcode probing routines:
linuxcnc.org/docs/devel/html/gcode/g-code.html#gcode:g38

You would need to connect the existing probe via HAL to motion.probe-input at the start of this routine and make sure it was disconnected when this routine was completed.