Starting to believe the Switch "Pro" is gonna happen, that won't be the name though. So, 2021 Switch Pro, and 2024 Switch 2. Or whatever the hell Nintendo's next console will be.
Edit: sorry, thought the thread title said "when", not "which". 4 AM brain is my excuse. I'll be taking my leave now