Current rig on the right, definitely need a refresh.
But right now still can wait a bit.
those announced 4000 series are for laptops.
Desktop 4700 not announced yet, earliest mass market available around dec 2020.
Just get a entry 3600 to play for the next 12mnths....