That will be a rather lengthy wait. They fleet he is in, as am I, is currently scheduled for final retirement in 2023 and that number has steadily risen from 2017. It's doubtful the new contract will change the aircraft retirement timeline although the way in which displacements are awarded is likely to change substantially.
I've been thinking of moving to one of the smaller planes anyway. Jet lag is getting harder to deal with. Maybe the Hawker.