Honestly (and this is coming from someone who owns a series s and doesn’t have a ps5) it sounds like the ps5 would be a better investment for you. Other than the storage option and the disk drive you would run into your same problems with friends ps parties and not playing those ps exclusives with the series x like you had with the s. This is again coming from someone with an Xbox but both are really just vessels for gamepass just one is better than the other. You can get gamepass on your pc so do that. Get yourself a shiny new ps5 and get your physicals, your exclusives and most importantly have fun with your friends my dude. Not financial advice