So, this doesn't do exactly what you need, but it might help a bit.

toolchange macros.zip

I suspect that what you need is something like:

code "g53 g0 x[your tool change X] y[your tool change Y]"

somewhere near the top of your tool height set macro. Note the G53 - this is important as it means "use coordinates on this line as machine, not work, coordinates"

Can you post your tool height set macro?