There is one macro on War that I found can really clean up your hotbar: A Defiance/Deliverance button that also swaps out Cleave/Beast and Cyclone/Decimate.

There's no queuing issue since defiance and deliverance are oGCD and you're just swapping buttons for the other skills, not adding macros to them.