Waiting will just make the decision of making the jump worse. If you have the upgrade time, you are on the tail end of the benefit. Waiting longer won't improve that benefit.