Sorry I forgot to mention the PSU, I'm aiming to go for the Corsair RMx 850 Watt PSU. I'll edit my above post to add that.
Thanks, looks like the D15s it is. If it comes with one fan, should I buy another for it or would the one it comes with be sufficient?
Regarding the CPU, I've been looking at the 5600x compared with the 5800x and have seen the minimal gaming performance differences. However a lot of the time when I'm playing games I'll have quite a lot of browser tabs open and potentially work documents too and thought the extra cores would help with that - what do you think? Do the 1% lows tend to be higher on the 5800x in gaming?
For the SSD, couldn't I partition it into an OS and storage drives? At least previously the higher capacity drives tended to be faster/better than the lower capacity ones so thought it would be better to get that. For PCIe 4.0 SSDs, I understand that we probably won't see the full benefits from it for a while, but I've seen that there's quite a few that are cheaper than the Samsung one and was wondering whether it made more sense to go with one of them or are they only faster in their peak transfer speeds but slower in general day to day use?
I haven't had an optical drive for about 8 years, so I wanted to check all the dvds and cds that I've got lying around to see what still works, what I can use and what I can chuck out! I take it an external drive would work just as well as an internal one?
Thanks for the suggestion of the Phanteks P500S, I'll take a look at it and also getting some extra Noctua fans.