Use an Authenticator app (TOTP) as you ought to be doing anyway, and the email 2FA disappears.
When you set up the device and GitHub showed you a handful of codes and said "don't lose these they're important" you kept them, right?
> Authenticator transfer hell
I've switched my primary TOTP device twice in the past few months and I have no idea what you're talking about.
- Use a 2FA app with sync like Authy (even Google Authenticator has basic backup/export support nowadays, but it's still far too easy to lose your codes with it)
- Use a password manager with 2FA support like KeePassXC/1Password/Bitwarden
- Use a YubiKey (ideally have two in case you lose it)