Hey Rob,
you are right. I don’t remember why I did not give the hint to use G53 prepended. This post is very old.
By the way, see also G53 bug.
See also Aiph5u’s ‘tool-change’ routine; I read the other day that someone prefers a position more in the middle of X travel for manual tool change, can be modified to suit your needs.