This is why I’ve gone with the “chord is the context” way with avoider: It will leave in the chosen intervals if they are in the current chord and avoid them only if they aren’t.
If you think the exclusion of m2 and TT might make for cool patches and are willing to try stuff that isn’t polished yet, I’d love to hear your feedback on it! details and downloads here