Yeah, I'll bet PS6 is business as usual but with an eye toward the future. Microsoft is already hinting that their next Xbox(es) are just going to be PCs, with talk of handhelds and additional storefronts.

I might impulsively buy whatever Nintendo’s next console is just for Zelda or Metroid, even though Nintendo as a company pisses me off.

Stay strong, brother. They only get to keep pissing you off because you keep handing them your money. There's no shortage of metroidvania games right now, and even Zelda has a decent number of competitors now.