Yes, there will be many more cores, but I suspect that the cluster programming model will start applying to smaller and smaller systems.

I can imagine a system where each CPU die has multiple cores with on a chip with memory, and multi-CPU machines appear to software as a cluster rather than a single system image.