Thanks, I wasn't aware of the NZ mode.
I felt that 32gb might be a little overkill for now but I was hoping to do a little future proofing with the 32gb. I forgot to mention in my original post that I already have a couple of 2tb HDDs and a 256gb Samsung 860 Pro.
I didn't know that the 4000 series would be out this year so I might end up waiting for that if it is worth the wait (hopefully not delayed for reasons).
I believe the PSU is a Corsair HX650 which is actually 650w not 550w like I mentioned. I got it around 8 years ago.
After learning about the upcoming CPUs I might end up waiting.