Having seen Melbourne grow over the past 40 years, my suggestion would be to start again.
There not enough gates, the freight apron is being used to as a domestic terminal and aircraft holding off gates at peak times in the morning is disgraceful.
By the plan it appears the Virgin hangar complex becomes a freight apron.