Yes, ordinary consumers are starting to use TOTP more but still may not be aware of what you pointed out.

To mitigate the risk of losing my 2FA credentials I use the FOSS app andOTP (Aegis is similar, but better UI, from what I hear). It can export your data as both cleartext and encrypted JSON so you can import into a new phone as desired.