I am booked for July and not too worried. I did book on ba.com so worst case scenario I need to hang in the T5 Galleries for a while. I am booked in in Prem+ but if BA makes me do a stopover I am going to give them hell if they do not upgrade me for the inconvenience....