Upgrading PC after 7 years, looking for advice on parts

As per title, I built this PC about 7 years ago and its finally time to upgrade some of the parts. The ones I am looking at upgrading are below

CPU: i7-6700K with a corsair H100 or H110 AIO, can't remember which honestly

RAM: Corsair 32gb 2400mhz DDR4

MOBO: Gigabyte GA-Z170x UD3

I'm looking at getting the following parts.

CPU: AMD 7800X3D with a Noctua NH-D15

RAM: Corsair Vengeance 32GB (2x16GB) 6000MHz CL30

MOBO: Gigabyte B650 Gaming X AX

The system is powered by a Seasonic Prime Ultra 850W Platinum and my current GPU is a 5700XT which I bought about 3 years ago after my 780Ti died and I'll upgrade it next year. My monitor is an Asus XG35VQ so my main query is whether getting the 3d cache version of a CPU will give a suitable enough performance boost to justify the cost and whether that will be a suitable motherboard as I also have an M.2 drive and looking at getting another as well as 5 HDDs.