Ok,heres a crazy idea.
Instead of banning Baton Pass entirely,lets unban the move but bans setup with it (like no SD,no CM,.....).
This gens bottlenecked most pivot moves like Teleport,Flip Turn,..... so i see this as a cool solution to add in to the pivoting game
Smogon had also done a similar...