I've been buckling down on my security and passwords lately. It wasn't too long ago I used the same password for many sites, but I remember someone found out one of my email and password combos for several sites (because I guess they hacked one of the sites I used and the passwords got leaked. They changed my email and password for Amazon (but luckily my credit card was expired cause I never used it due to being in China). Since that time, I realized that this was a warning of a possible future catastrophe and started to really focus on my passwords and cold storage.
The only thing I'm worried about with 2FA is moving out of China, losing my phone number or something else because that could lock you out of your own accounts.
I've been meaning to get a crypto only laptop setup however it's proven difficult as I'm not disciplined enough to only login from one computer lol.
In terms of being locked out are you using Google Authenticator? I am as well and I forgot to backup my seed from Google when I created it and you can never recover it after that. I've also had a few scares with losing my phone or having my phone not turn on momentarily.
One of these days my plan is to login to all my accounts at once, turn off 2FA briefly, erase the app, redownload the app and then set my 2FA backup