Just to give you an idea of what my rotation looks like.
Shield Slam > Revenge > blah blah blah
Here is my theory on leaving Demo shout in and Shield Block. After your first Thunderclap then Shockwave, your Tunderclap is on cooldown. But not for that long anymore. I believe its a 6 sec cooldown. Especially since everything is so set on AOE tanking I would really concentrate on hitting that second Thunderclap ASAP. So when you do your Thunderclap then Shockwave, you have still a couple seconds before Thunderclap is up, so you throw up Demo Shout and Sield Block to help mitigate dmg, then your Thunderclap is definately up again. If you feel like you can only hit Demo shout in that time, then do that in the mean time. It will take a little time but you will start to develope a rythem. I know you said you use Thunderclap when on cooldown but in this rotation it makes sure you use it a second time, before even starting on Shield Slam....etc. Since the patch not only is the cooldown for Thunderclap shorter, it also gives a ton more hate than it did before, so that should help you. Also use your Vigalance of course. At the start of an instance I like to leave it off and see who generates the most hate. Then Vig them. Although, when in doubt, Vigalance the Mage or any other AOE whore lol. It will ensure that your keeping hate in those critical AOE situations. Hope this helps. Everyone developes their own rotation. After the basics are met, its up to you to decide what works best for you. You can also get the newly revised Cleave Glyph. It now hits 3 targets. Might help.
80 War Avviax, server Malorne