What we should do is just leave Baton Pass the fuck alone. We already made it a completely terrible strategy barring a very specific six Pokemon that are incredibly easy to play around with an average team. Full Baton Pass was literally ebola. I agree that doing something about it was overall a good decision. Then people innovated ways to make three Pokemon Baton Pass teams work, and instead of making minor adjustments to teams in order to beat it, everyone bitched. Same shit is happening here.

Baton Pass is not broken in OU on any Pokemon, so none of Baton Pass, Geomancy, Smeargle, or Scolipede should be banned. The strategy is inconsistent and unreliable. That hardly means broken or uncompetitive in my book.