Time to move towards practical pubkey based payment systems like Monero. You can never run out of cryptographic key pairs.