Finally managed to get the build all done. Its built, windows installed, all ready for him for Christmas. Should last him years. Thanks everyone for the suggestions. It cost me £1460 for everything. Most of it from OCUK, CPU and HD weren't.
I went with:
7800 X3D
32GB RAM 6000MHz CL 36..
Sapphire Pulse 9070XT
Sapphire Pulse B850M Wi Fi mobo
2TB WD M.2 SSD
Be quiet! Pure Power 13 M 850W ATX 3.1 80 Plus Gold
Lian Li Lancool 216 RGB Mid-tower PC case
Thermalright Peerless Assassin 120 Digital Black CPU Cooler
Pretty chuffed with the whole build. He should be very happy lol.