Since you have a Quest 2 already, why don't you try the following.
When you connect it to your computer, what resolution and refresh rate do you set in the Oculus app?
Have you changed the Encode bitrate in the Oculus Debug tool?
Depending on what you set those to, it makes a massive difference to the visual quality of PCVR games.
As for comfort, I presume you are using the stock strap? The problem with the stock strap and the basic Elite strap, is that the headsets slips down on your face because the weight is all at the front. What people then do is tighten the side straps as much as possible to stop the headset sliding down. This gets very uncomfortable, and sometimes painful. after a while. The trick is to get the top strap right, so that it's holding all the weight and tighten the side straps just enough to hold the headset in place. However, this doesn't work for a lot of people. So, the easiest thing is to attach a counterweight to the back to the strap. Something around 200g, like a power bank or battery or a phone. This stops the headset sliding forward and that means you don't overtighten the side straps, which is a much more comfortable experience.
With your GPU, the Quest 2 should look way better than the Rift S in most PCVR games. If you set it up correctly, with the proper settings in the debug tool and close to native resolution in the Oculus app, it should be big improvement over the stock settings.
For testing the comfort, try the counterweight. And if you think the comfort is ok and the visuals are better, you might consider buying a second hand Quest 2. If you do, you can purchase a custom headstrap like the Bobo M2 VR and that should make it a lot more comfortable as well as adding some extra battery life.
I had the same feeling with the Mini 3 Pro and I bought that!
