Anything to do with toolchanges happens, or at least starts and ends in the M6 macros.

I'm not entirely sure, but I think once you've used M6start to move to your toolchange position, you can then use your tool zero button, then once you're finished and click cycle start again, M6end takes care of moving back to the work area.