Here is a way without losing your queue ability: use chotbar change for your gcd skills.

What I do is make a macro with warrior gcd skill icon but does not contain its ac. It only has chotbar change to the another set. On that set place the actual skill on the same slot. Now when you mash the macro itll switch to the other set and trigger the queue. Now this seems pointless..until you put other skills on the other slots in the set you end up on. On maim macro press your skull sunder suddenly turns into storms eye! With 2 extra sets 'sacrificed' you can have all warrior combos in 4 buttons. Example: bb combo is square triangle circle, se combo is square circle triangle, sp combo is square circle cross for me.

This also works on kb btw, with hotbar change macro. I have set my bb combo to 123, se to 132, sp to 134. If you happen to mess up and jumped to the wrong combo set on controller, you can set the set selector trigger to only rotate to set 1 making it a reset button or you can set select manually if you are dexterous enough. As for kb, I havent checked if theres a set reset button but you can macro heavy swing on the extra sets to bring you back to your original set anyway.