Umbrage or Tokk as BIS warrior (Already have Sylvanas' Cunning).

Hi guys i just wonder which should I choose since i already got TOGC cloak? Tokk provides more AP and Umbrage provides more Haste (Cuz arp cap)

This is my armory : https://armory.warmane.com/character...daeron/summary