There really isnt another viable build for tanking though. It has to include all those abilities pretty much. Reading that i understood that 21% is your aim, not 21% + riposte.
Anyway, i do not agree with a few choices in that build anyway.You do not “really” need Master Focus as a tank. It really isnt needed to have more damage in master strike as you will only use if everything else is on CD and you are satisfied with your positioning. Also i have tested with Swelling Winds and i found out that the 20% increased damage on force sweep and cyclone slash, although quite significant, doesnt really affect threat generation much. I prefer Guardianship.