yeah i hear you a 40 min uber can add up quick. I'm guessing stock will be limited as well, and they won't be likely to hold it for you.
Honestly if you're having a hard time I think you would get a lot out of a mid range / budget system. Things are not like they used to be, tweaking can be fun but OCing stuff doesn't do as much, and the midrange stuff gives a really solid experience. For example back in the day we were always impressed to run 1280x1024, 1080p is 58% more pixels. We were also often happy to get 30fps in games. These days even a modest rig can run 1080p 60hz easily. You could likely return the CPU as well and get a more modest one.
Of course it's your choice, but I think it's hard to conceptualize what the performance means when we've been out of the game for a while. If you want to go for the moon, we're here for it, but I'm just sitting here thinking about how perfectly happy I am with mostly mid range gear with a few upgrades here and there since 2018. When I built the system I was stubborn about memory because for whatever reason it stuck out to me as a big deal in the past, so I got the best chips I could (samsung B die) but to be honest I don't think I'd even notice if XMP was disabled much less if I'm using the best overclock I found (I'm not, but it was fun to find as a project).
My upgrades have been CPU: 2600x -> 3700x; Memory: 2x8 -> 4x8; GPU Vega 64 -> 6800XT; Storage 1TB SATA, added second NVMe for games, replaced SATA driver with 2TB NVMe (I probably went overkill on it).
Edit: I should add the CPU and memory were mainly to play a specific game that was poorly optimized (DCS) - it helped a little but didn't fix the problem. I don't play it anymore, problem solved lol