I made almost the exact same upgrade, 2500k - 3700x, 8gb - 32gb, a 1TB nvme drive, and the same gaming plus board. At least the dangerously low quality msi mounting brackets aren't used with liquid; but for that much money you could get a 3800x and a fat noctua cooler with it's own brackets...