The biggest question is now: Is it better to wait for the next generation or am I fine to get the 2070s or 2080s? It's not urgent at the moment and I'm planning on upgrading to the release of cyberpunk if there isn't some very good sale till then....
Well, it's supposedly releasing April of next year. It's just now going on September of this year. It's a lengthy period of time. Planning a PC upgrade around a single game so far out from release is typically a poor idea. Drafting a rough idea of what you need to upgrade and the parts you'd anticipate buying to do so would be fine. If you need to upgrade for some other reason, by all means. Otherwise it makes far more logical sense to hold off. The lone exception I can think of is jumping on heavily discounted prices as they appear.