You should keep gyms, just in a non story-centric way.
In a design of mine from a while back, I was going to make gyms like the challenges they are supposed to be. They didn't have any story relevance or requirement to get, but rather acted as special challenges for people who wanted to take...