I'm using an interrupt as watchdog,
An interrupt driven watchdog reduces the watchfulness dramatically. Do not use interrupts in watchdog code.

and I'd need to change the return address to another place in the code when it exits.
Bad idea, while you may be able to make it work, it will be a maintenance nightmare.

Erik