Not having Devastate in your rotation is limiting your Sword and Board Procs. I would keep the primary Shield Slam->Revenge->Devastate rotation and include Shockwave and Concosive blow in as appropriate (there is a post on the rotation somewhere here on the site with a nice graphic to show it). when you need to dump rage queue heroic strike... I have it queued almost 100% on most boss fights. TC as needed to keep the debuff up. and when Shield block is avail pop that for bigger hits on Shield Slam. I usually keep a nice lead over the DPS when I tank though some of the fights where kiting is involved they can start riding me. You might want to consider ditching the glyph of last stand and grabbing the Glyth of Devastate.
I like my women how I like my coffee, ground up and in the freezer.