Switch Generation 2 would be the smartest move; especially if they push it out with a higher-performance Breath of the Wild 2 and a Super Mario Galaxy 3 on the horizon. Take advantage of the scalability feature and generate the greatest amount of excitement.
I can see Nintendo almost certainly doing 25m+, perhaps 30m+ year if they push that.
I describe myself as a little dose of toxic masculinity.