Both combination is OP
So far Anet killed Abrasive Grit by adding a 5s ICD
And still no action on Tormenting
My thought is instead of adding an ICD, what about add a trigger threshold on Abrasive Grit, only be triggered when you gain a barrier amount more then let say 250
For the Rev+Tormenting, I don't think changing Rev or adding an ICD on  be good. But adding an ICD around 1.25s~1.5s on target will be fine?
i.e. ideally, max 171(when 0 Healing) * 5 per second, if there are so many many target to let you ignore the ICD, well ... good luck