My issue is that the tank on the left just ends right before the waterfall. In reality, the tank would be built right up into the rockwork surrounding the tank. But they liked the waterfall effect, so they have the tank stop just few yards shy for some odd reason. IMO, the tank scene should have replaced Stegasaur Springs if possible. The area always feels cramped as it is and the cavern would make a great transition of going into the tank viewing area, especially as we see there's a waterfall above leading us to believe there's a body of water above that point.
That might make for the most logical visual transition, but I wouldn't want to lose those AAs either. If our ride gets rethemed, I'd much rather they put it in Predator Cove, which is easily the worst part of the ride now. And things have already started to go haywire by that point, so at least the glass breaking would seem less out of place compared to it happening at the beginning of the tour. I'm just not sure how well it would fit.