Personally I think it would be in the park's better interest to remove Excalibur and expand the waterpark. They could reroute the access roadway to go around the new expansion (the road could actually go on a retaining wall to make sure the new area doesn't flood like Excalibur's lower section does.
Not going to this and more than likely won't be going to Mayhem or BahnCon either