Glad you learned about SIM swapping... But honestly surprised this is news to you only now. Yes, use an app like Ente or Aegis. Make sure it's open-source and you can export your codes. (Google Authenticator denied exporting for a long time, not sure if they even allow it now though I think I heard they might, still wouldn't use Google for this)
