I might go Steam Machine route in the PS6 era, I know it's technically same on Steam, but they have at least been much better at not rug pulling, and there are easier way to circumvent things on a Linux/PC machine. Unless Sony changes their stance so that either I have full lifetime use of the game or an explicitly stated period of time (which if shorter than lifetime I'd expect to be cheaper).

I'm even willing to drop resale of individual game, if I can just sell off my account as a whole to someone else.

Valve is also pretty amenable to adding third-party games to the box as well. It's trivial to add games from GOG using Heroic and play them alongside regular Steam games.

My main "game console" is a NixOS box running Jovian, and I have made oodles of Flakes that I use to make custom non-Steam games that launch deterministically, and as far as I'm aware, Valve is perfectly fine with this (not that I particularly care if they are).