I don't know if I can help OP but anyone reading this who uses Google Authenticator. PLEASE BACKUP AUTHENTICATOR on another phone. It is very easy. Here are the steps:
https://www.protectimus.com/blog/google-authenticator-backup...
https://www.protectimus.com/blog/google-authenticator-backup...
If you really want to be superstrict, you can have one KeePass database with your passwords, and another, with a different master passwords, for your TOTPs. It's less convenient, but it still stays completely under your control.
Except for Apple, which rolled their 2FA in their own, incompatible way... for your convenience and safety, of course.
"Go back in time and save the raw secrets" might as well be a certain-fingered emoji to basically literally everyone.
At this point, the only hope is getting webauthn everywhere and train people to always enroll a primary and backup token.