Unfortunately MM, you have to take some risk in this decision.
Chances are the facelift deals available next year will not be as good as those on the outgoing mk7.
Positively the few problems of the early mk7 will have been sorted by the end of the current production run.
The facelift upgrades on tech, will there be teething problems, do you need more tech??
It also depends on your time frame, if you hold out for the announcement of the mk8, the mk7 facelift may be heavily marketed.
Currency effects and potential tariffs may or may not be a concern to car pricing in the future?
Personally I would try to get one of the last mk7 if the deals get even better to clear the remaining cars in the system.
These cars may be offered at a competitive lease to clear, that way you get a late mk7 for 2 years then reconsider a Facelift at expiration.