Yes I believe you are correct on both accounts. Also I'm pretty sure KD does not own the land behind Twisted Timbers. However they do own both the large chunk of land by the water park and a chunk of land behind Grizzly where DA used to be. Since KD already has another wave pool, I highly doubt that they're going to "Upgrade" or renovate the extra one thats been SBNO, a partial expansion with two or three new water slides is much more likely for next year, nothing crazy expensive, followed by their next coaster in 2021.