Since I got my hands on my all time favorite case (the Lian li o11 dynamic PCMR), I transferred my system from Coolermaster s400 to the O11.
I was able to add a 3. Rad and additional fans. Which improved cooling performance and noise level. Since I game in 5K Resolution (21/9) there was no big need to upgrade CPU since I‘m at GPU limit most of the time. But when I get my hands on a reasonable priced 5950x or 5800x3d I might upgrade.