Yup i'm very much of the same thinking. Knowing the GTAA, anything that's constructed in an "interim" fashion will be there for decades and decades without any form of further improvement.
For reference, this was the 2008 Terminal 1 expansion plan (which goes hand in hand with 1 of the images...