Personally I'd rather they found the cash to build the mid field pier opposite T2 as they'd originally planned. That would provide sufficient short-medium term capacity to put all traffic through T2 and free up T1 (and possibly T3) to be demolished and a new, compact easy to negotiate terminal to be built in their place over the longer term.
However this is but a pipedream and no doubt the current policy of meddling and making do with the original 1960's structures will continue well into the forseeable...