Just a hint (too late for you now)... When you set up two factor using authenticator, do a screen cap of the QR Code and save to an encrypted folder on your system. Then any time you need to set up a new device, you can use the same QR Code and it will work. You can also set up multiple simultaneous authenticators this way.
Yeah, I read that tip on the web today when I was searching around for how to solve this. I'll be doing it this time around, for sure. I'm lucky that I only have a few things that are linked to Google Authenticator, so it shouldn't be too hard to switch over.