What about nerfing it by only allowing baton pass plus another non-damaging move? That way we wouldn't be hurting quick-passing or dry-passing to avoid pursuit. The only set that comes to mind that would be affected by this would be dual screens espeon, but that isn't very good to begin with...