As of now, no to both. I'm not expecting Nintendo to do anything that I would prefer them to do so highly unlikely that I buy Switch 2 and even if I do, it wouldn't last long. Of course, when you're someone who's only completed 10 Nintendo published games from 1996 through 2023, it's safe to say that im not a Nintendo guy.
As for PS5 Pro, I see mid-gen consoles this generation as a total and complete waste because the PlayStation 5 and Xbox Series X are more than capable of lasting 8 years and with every generation, it's usually the last two or three years where you really see developers especially first party take full advantage of what the consoles can do. In this scenario, I see both the base model and pro model as being underutilized with a lot of what they can do never being taken advantage of.