If they're going to build a new ride in two years, I question how much in-depth theming there will be. This isn't doubting Disneyhead but more considering that they simply wouldn't have time to go all out. Maybe we could look at other recent projects (ex. Kong, Gringotts, etc.) as examples of what to expect.
Entire diagon alley was built in 2 years