I'd be tempted to give it a year-long break at the end of the season. In that time, have a rethink about why we need it and how we deploy it.
At the moment it feels like nobody is happy with it. Too much inconsistency, too much disruption, and the sense that it takes away more than it...