I'm pretty sure that water, along with poison, will have a gym.
As for the idea of having a fire-type E4? That's already been used. If they totally switch out the Elite 4, then it'd be cool if they had Electric, Flying, Grass, and Rock. Those types have never been used in the E4. I strongly...