What code setup works on an Acurite 3500i

I keep having problems with tool changes resetting the zero to odd locations every time the machine receives a G53 command. My code looks like:
T1 M6
G53 O1
if I get rid of the G53 line it mostly works but it then doesn't change the offset number to match the tool. I was wondering if there is a better way to do it?