I say stick with your itinerary. Your flights are before the (scheduled) move of T4 services to T5 and things should have improved over the next couple of weeks or so.