100%, You wait for the beefed up Switch, While I wait for the one after that one.
I buy the stuff at the time I have monies for it and enjoy life when I can. Current Gen Nintendo I have enjoyed Pokemon, BOTW, Pokemon again, Mario Kart, Animal Crossing, Fire Emblem Tree houses, Xenoblade, Yu Gi Oh... list goes on.
Might even buy a PS 5(Not now due to monies), wont wait for a beefed up Pro, nor would I wait for the PS 6.
Out of everything you mentioned, the only game I would buy is Zelda. We're not in the same demographic here. I'd rather just upgrade my PC with an RTX 3070. I'd be buying a Switch to basically play Zelda and Mario games. Not sure if I'd care for anything else. So at the very least, Nintendo can provide an ounce of horsepower so the console doesn't look crap when docked into a TV.