According to the paper, 6G deployment is planned for 2030 and the "earliest plausible" deployment of 7G is listed as 2039-40. You'll have plenty of time to upgrade.