>>305091819
I feel you should probsbly upgrade both. 1060 is probably just about keeping you going but you could do with a 2070 or 2070s. Maybe wait until 3000 series and see how the 3060 is?
As for CPU I don't know what to recommend but as others have said, it ain't the best