I largely agree, although I think mixed-reality will be the new UX, with voice & AI being a big part of it as well. But we may need 2 orders of magnitude in GPU/Watt performance before light-field glasses replace 2D screens.
Given the gargantuan data/compression requirements of light-fields (Lytro's cameras capture >300GB/sec of lightfield data!!!), plus rendering, persistent SLAM, etc, we'll need the power of a GTX1080Ti or better, but able to run flat out using only 1-3Watts of power instead of ~250W.
The good news is this is what the global smartphone manufacturing ecosystem is working towards, with a relatively short device life-cycle to finance the huge effort that will be required to get there. But mid to late 2020s will be all about mixed reality. I am convinced that it will be so incredibly compelling, that any 2D screen, no matter the size, resolution, dynamic range, or refresh rate, will be like command line compared to GUI today.
We're currently in the modern equivalent of the mid-90s DOS plateau, where an experience that's actually quite mediocre has become the default user expectation.
Getting past this requires an order of magnitude increase in processor power. Given what's happening in hardware that seems unlikely any time soon.
It's more likely tablets will gradually catch up and merge with desktops - but there won't be any dramatic change in the UX offered by either. That needs speed and UI technologies that are at least a generation away.
The new UX will come from voice, AI, and robotics, which will make computing more physically interactive, and less tied to the glass typewriter/document library model.