After looking at all of these possibilites, Shrek seems to be more and more in the way. Would they have time to get rid of that within a year? The contract with Nestle ends in 2015, and the targeted opening of the Wizarding World is 2016. Seems like it'd be kinda rushed, in my opinion.