I'd switch the Samsung 970 SSD for a 980 pro. It has been on sale for $60 here in the US and you'll get faster speeds with its PCIe 4. https://versus.com/en/samsung-970-evo-plus-1tb-vs-samsung-980-pro-1tb
Edit: Also, this is my personal preference so take it as you may, but I got so sick of AIOs clogging/pumps dying and Noctua makes air coolers that are very nearly as effective around the same price range.