I feel your pain - have been through this twice in my Marketing Automation career.

You should consider taking this opportunity to switch your address blocks to snippets. Then you have one place to make address updates, across all emails, regardless of templates.