Personally, I'd choose a mixture of both, namely Saph's list of conditions and Sophismata's spell removal. IMO, IHS removing AMF (at least for you) is a feature, not a bug. IHS, for me, is about crushing debiliating effects, or at least strive in such an environment where others are still affected it.