Disney World ToT will always be better though I've never ridden it, my understanding is the ride is a completely different experience based on the mechanics of the ride itself. As far as GotG:MB, this is definitely phase 1 of marvel Land. There is plenty of space behind the ride which is nothing but imagineer trailers and parking which will be converted to a new area. I just don't expect them to do/announce anything until Star Wars Land is either close to opening or operating for a short time.