Sorry to hear it. I use Yubico for 2FA, but in some cases Trezor can perform the same function. Trezor can also store your passwords.
Security will become an increasingly unsustainable nightmare until authority relinquishes control and decides to allow their security model to be turned inside out (no large honeypots or large databases of sensitive info). Data needs to live in it's own rightful location and not be hostage to authority. Hashes of data can prove ID on the rare occasion it is needed.
RE: You Just Got SIM Hacked! Now What? Crypto Mondays, San Juan July 8th