You can group al ERC20 tokens in one wallet. I use a MeW wallet in combination with a ledger.
NEP5 Tokens can also be kept in a wallet if I'm not mistaken.

As far as I know their still isn't a wallet capable of holding all coins and tokens available.