Getting the Switch 1 version and paying for the upgrade is going to cost about the same so I decided to just go for the Switch 2 version.
Also, I guess I never posted all the Switch 1 games I bought in the lead-up to the Switch 2's release. Not gonna get individual pics because there's too many of them but here's a pic of the actual stack:
Why, yes, I did go overboard... Oh and I just got a copy of Hyrule Warriors Age of Calamity from ebay. I'm holding off on Super Mario Wonder and a few more in case they get Switch 2 versions in the near future but at this point there's only a few more first-party games I'm interested in.