Nah much sooner than that.
It’s coming later this year or early next year.
The revision will be using a custom X2 chip.
2020 will be Switch 2. Using Xavier which will put on par with Xbox one X and 8K video rendering. One thing to keep in mind is that arm is catching to x86 very quickly.
Apple is already will be ditching intel chips which will further innovate mobile chips.