If the cost for the IP's use is part of Disney's equation, neither building a new ride nor overlaying RnRC would help Disney (I'm assuming there is truth to the contract for use is up for renewal, Viacom wants more than Disney wants to offer, and Areosmith doesn't get as much as the new cost to Disney to use The Twilight Zone.
I certainly do not see how GotG fits with a 30's hotel ( as I can't imagine Disney would want to mess with the outside of the building. I do wonder how much Disney would need to change the concept of the elevator ride to avoid the IP holder trying to sue that they kept enough of the story from the episode the ride is currently based off.
Reading the parts of the contract that were posted in this thread, seeing the park about use of any characters from any of Marvel's families of companies (I assume this can't relate to Disney as they are now the parent and I imagine the courts would view the contract as meaning child companies)...wouldn't it be funny if Comcast could turn this on them and get to use Star Wars.