In exactly the same boat but almost a year ahead of you. Extended our Tiguan in February so in for the second MOT this week. Looking around now as last minute rarely seems to work out. Did want an Enyaq but that option went up in smoke recently.
As others have already said, you can order any time for the next 2 years, no need to wait till the end of the lease, and even if you do, you’ll keep the Volvo until the new car is ready for collection.
"Man is born in freedom, but he soon becomes a slave, in cages of convention, from the cradle, to the grave."