https://i.imgur.com/xOEYcRe.jpg
Many thanks to all the staff at overclockers for supplying most of the parts used in my new build, particularly the key parts of the Ryzen 5 5600 and the Sapphire Nitro 6700xt. I was fortunate that the voucher I got was for a 6700xt that fit my build, just...
Managed to do some tweaking tonight, so now both CPU and GPU are undervolted. Probably saving myself about 40W overall. Also made minor adjustments to the fan curve so runs 5 or 6 degrees cooler without much increase to the noise.
I was planning on building with a 6800, but with everything going on I am very happy with my build, especially since the 6700xt is such a massive upgrade over my old HD 7950. Possibly only thing left to do is change out my old Noctua case fans for something in black and maybe 140mm.