There is zero chance of me buying any new Switch unless my existing one breaks. We can now confidently say that there's not going to be a mid-gen upgrade of significance until 2022 at the earliest, which would be 5+ years from launch. I doubt that the Switch successor will launch later than 2024. So, any upgraded Switch will only be the top of the line system for two years. Not worth the investment.