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 in what
@rbt had posted):
View attachment 573918
Now below we look at how it evolved in 2015:
View attachment 573927
However it looks like the GTAA is planning on further watering down their already watered down plan. Below was the most recent version of the expansion plans (watered down from the above):
View attachment 573922
Now let's look at the even more (current) watered down expansion plan:
View attachment 573925
So essentially (although things have yet been finalized) the GTAA keeps reducing the scope of the expansion with each successive study they do. Pretty sad, especially when you take into account the original master concept:
View attachment 573928