What about just choosing which skill is used for auto-attack. Let me choose which of my "free" attacks I auto-attack with.