Everything working very nicely now, the new set origin button code is faster and does not mess the DRO's up

I also now have the Z rapid to slow position during a G28.1 move.
I think this thread has served its purpose well, thanks go to BR549 for all the help, and to any others who chipped in.
A short video of the final setup making a couple of cuts...
https://www.youtube.com/watch?v=FV6WpuQjFE0