That seems like a logical move. If Hyundai can't work well on a new car he can leave without any issues.
My bet is that he'll win a championship or two with Hyundai, go to M-Sport for 2022 and retire in 2023. M-Sport has always been good with new cars so perhaps he'll win a title with them too.