Yeah I have a pretty similar rig, 6700xt and ryzen 7 3700, in my case I actually bought a steam deck to replace my switch (and Holy crap it's so much better) and I just believe getting a PS5 wouldn't be worth it, there's only like 3 or 4 exclusives right now on PS5 that are really worth it, god of war 5, returnal I think, and horizon 2, I think if you spent the money for a PS5 you just wouldn't use it that much, on PC you can already play every god of war before 5, horizon 1, spiderman 1 and miles moralis, all uncharted games, you can also use a dualsense on PC and get the haptics and trigger effects, regarding the switch I would personally sell and buy a steam deck but that's just me you'd have to research more if you'd want to do that, I wouldn't say the OLED model is worth the upgrade to be honest