Again thanks to all for input.
The biggest put off the 3000 chips is the price of the motherboards.
If I was to go for the current CPU it would be 2600x or 2700. MSI Carbon pro x470 (have found a deal on them for just over £100) 16gig of 3000/3200 ddr4, and more storage.
GPU is an nitro+ rx480 and still good enough for now anyway, PSU is alright for now.
Get an X470, you only need X570 if you want PCIe4.