Personally I'd stick with Win 10. We all know how these Windows release are, 11 is gonna suck, bad. Unless you're really desperate I'd absolutely not breaking your pattern, Build the system yourself even if it means using your old gpu for another year. The value is pre builts, even with selecting the parts, simply is not there. I recently built my system (Ryzen7 3700x on an Asus x570 mb with 16 gig ddr4 3200 and a Seasonic 650 watt 80+ gold) and went to 15 select parts sites and every single one of them was a ripoff both in price and in lack of name brand parts options. I waited 6 months in EVGA queue for a 3070 til I couldn't stand it anymore then caved and paid too much for a 3060 ($629, same as I'm in queue for a 3070 for). I figure the shortage is gonna be another 6 months at least. I'm still in the queue so will probably buy the 3070 when my number finally hits and sell the 3060 for whatever I can get for it at the time. Up to you ofc but just my 2c. Go AMD and build it yourself. Don't ever buy cutting edge tech and especially never early adopt any new Windows release.