Get rid of echoes of power, it's ungainly, and feels like duct tape (Kind of like DA, but not in a "it punishes the players for not playing inside of the box" kind of way).

Replace these spells that you've given to Savants and Archmages with spell-like abilities, adjust cooldown timers as necessary, and you're done! Easy peasy.

In fact, you could even give more spell-like abilities, to make up for extending the cooldown timers, so that there are more options, and more to cycle through.