Personally I think a satellite terminal - fed by transit or the tram - up at the Gogar end of 12/30 is logical giving greater road, rail access than EDI currently 'enjoys'.
Switching International/Domestic terminals could also be on the cards.
I wonder what GIPs future Master Plan will reveal?