Ok, hear me out: i love trainer class as much as the next guy (pic related), but i also think that routes should be much less compact with random trainers. That doesn't mean i want them gone though: what i'll like is that every trainer battle is related to some sub-story to make them more interesting.
So in summary, less trainer battles, but more context behind them.