I'm keep all erc20, nep5 and of course eos in Infinito, it will add EOS if it succeed in launching the mainnet. So I just stay calm and wait for the news, that's the convenient I like.
https://www.infinitowallet.io/blog/infinito-wallet-is-the-first-universal-wallet-supporting-eos-mainnet/