I would probably reroll vit for attack speed.
Perm vengeance is essential though but wouldn't waste a weapon affix on it. You can get cdr from 2/3 other items to reach 37% - e.g. shoulders, gloves and offhand
Try doing Vaults as well (by cubbing a puzzle ring), I've found 3/4 this way and it's really quick.
Also focus on reaching T13 and grifts over 70, they started dropping like crazy when I reached this level. I have almost 20 in my stash now