Sorry not read all the thread but is any plan to move Iberia? Can't make up mind on booking to Madrid. The connection not an issue.

BA early flight and connection (don't like T3)
Iberia late flight from T2 (don't like flight time)

Assume by September or October both BA and Iberia still based on current terminals? Use KLM from T2 regularly and generally good overall. My last trip through T3 not the best start to day. Thanks