I would agree but I didn't like the New Fantasy Land approach. I really feel like they should have updated the original Fantasyland before putting the gorgeous new one. The original is so outdated with the medieval tents and boring red pavement, I was shocked on my first visit. Changing the whole look of Tomorrowland to one theme was good idea, although I understand people wishing they'd keep the 94' look..
Funny thing is, Guardians would have probably fit the 94' space-station look and Tron would have perfectly fit in Epcot, though similar to Test Track in theme. I'm not sure why they choose to take the more complicated route but there's no going back now.