If we assume the Lockheed plot is the future 3rd gate and/or water park. You'd have to assume they would build another garage there. How about they connect the lockheed plot, the WNW area plots(which would be converted to hotels), and the existing garage/transportation hub with a monorail system? That way anyone staying at any of the hotels could hop on the train and go to all areas. Something like this:
With Blue being hotels, purple being stops, yellow being new parking, and green being the 3rd gate. The rail would probably need to extend north to the existing hotels, but I was done when I remembered them. THe route I took just was quick, most logical looking one. There is probably one that makes this more feasible. It also would need quite a bit of land and right of way purchase including crossing I-4, but if all the rumors on here about expansions are true, this might be the best way to pull it off.