Ryzen 5900x Build

Gaming, Yes! Developing, Yes! Enthusiast, Check! I'm mainly a developer, database guy, and system's engineer, so I need many screens, but capability to do compiling, querying and more. Visual Studio, Azure, SQL, and Teams are strewn across the display most hours. I have always had issues when trying to game with "surround", so I've made my main display a 4K TV (LG CX 48"), which can be the main gaming screen, with 2 Dell's in portrait mode for Teams and Email. I don't game enough, but when I do this thing is terrific. Cooling has been a steady problem. I've used the EKWB RGB Kit, and the pump seems to have a very, very slow leak. Dye is on the connector but no visible drips. Took the pump apart and cannot find the source. I'd like to go with hard tubing, but the pump does not sit well in the Cosmos II case (I'm bracketed to the HD cages and that's flimsy). I'm looking though to move to the Ryzen 4 platform for future growth.