Are you upgrading to Ryzen 3600 or better? Why or why not?
Me personally, I don't see my 2600 and 2070 at my Apknite company bottlenecking or having stunted performance for a few years. Even in games like The Division 2 at absolute maxed out settings, as ultra as ultra can be at 1080p, I'm still rocking at 100-120fps with no bottlenecking. Even the 1600 generation is still rocking and I haven't seen games even require a recommended spec that makes you go "oh crap I need to upgrade."