Abyssal Drain could just replace Unleash once you reach the level it's obtained at.

Just in general, they could deal with the button bloat by not only removing skills and adding new ones, but "upgrading" the ones you have to something fancier and more powerful.