I think they should implement an ability that has 2 abilities to it. For example:
Heightened Senses:
Defensive Bonus: You become more agile, gaining + 30% dodge, and + 30% movement speed.
Offensive Bonus: You gain + 20% atk spd, and + 10% crit strike chance.
Now, you would toggle between which bonus you will use, and it puts the other bonus on a 30-45 second cd. It would make the ability highly situational and make you choose abilities based on your situation. This could even go for other abilities such as an ability that is a finisher and an ability that is a defensive cd.