It's too close to the required service entry date of 2009 to be messing about with the design of T2 (when, of course, they actually confirm what it is!) They need to work with what's planned for now, but ensure that the available space is used as efficiently as possible. As I mentioned above, moving cargo ops to a new site west of 16/34 would free up parking space for pax aircraft.
Given the importance of the airport to continued economic growth, it is vital that there is interest at government level - the DAA must be in no doubt that it is being watched by a steely eye and that there will be consequences for making a dog's dinner of things again. Oversight is the key; the government must also be prepared to direct and set out goals, in terms of pax and cargo handling and the future shape and development of the airport.