Given the box office success of the sequel and the fact that R&D is already done, I think WDW's ToT may still close for the makeover. After Star Wars opens in 2019, Disney would have the park capacity necessary to have the ride down for an extended period (the only reason this hasn't happened yet), as well as an adequate distraction for closing the park's former headliner. Like DCA, they could start work before the ride actually closes, and then reopen it in time for the third movie, which is
speculated to be released in 2020.
I know Guardians is still being considered for UoE, but it would be so much easier and less expensive for Disney to hype the positive reviews of
Mission: Breakout! in California and justify that for changing the ride. Retheme RnRC to something else, paint Sunset Blvd another colour and you got a quick fix "Marvel Land" for the park.
Not that I would want any of this to happen, but it's easier for me to believe than Disney opting to spend big $ on a completely different GotG ride.