This. I will add one more, price Wall. The cost to design a CPU along with cost of leading node is increasing, while the scale and ASP are not increasing. Cost of building new Fab is increasing, cost of Fabs equipment is increasing, cost of design tools are increasing, they could be double the price of what it was 10 years ago, and the scale of PC unit has been mostly flat or declining for number of years. As this trend continues, 5nm, 3nm somewhere around these TSMC nodes there will be less players able to afford these. For Intel that means they will sell it at a smaller die ( higher margin ) and try to recoup their investment asap.
For AMD there are lots of improvement, mostly catching up Intel. Zen 2 will increase IPC, 7nm allows them to double the core count AGAIN. Zen 3 with 7nm+ will have DDR5, PCI-E 5?, and other improvement.
So the 10/7nm cycle will dramatically increase core count, thanks to AMD.
Unfortunately DRAM and SSD are still expensive, and it seems the Cloud Sector has infinite appetite for DRAM and SSD.