You will notice minimal gains getting a more advanced cooler, I would check the airflow as with the fractal 7 i had to replace the top cover and add some front facing fans to increase airflow to stop peaking at 90c of which under full load in most situations is 80s now. Switching to water or something else will not yield significant gains unless you delid the cpu based on benchmarks.
These all run hot and you just need to accept that.
I also abandoned curve optimizer as there is no accurate testing methodology that exists at the moment and you will experience stability issues in most cases because of the design has variance for each stepping which cannot be adjusted or set to static. It is just a stupid ass offset which applies to every stepping interval. IF you can get it 100% stable it has quite the benifits, like 10-15c difference in temps and higher/more stable boost clocks. The gains for time:effort are drastically disproportional from my perspective (I just wanted a silent build thus lower temp/fanspeeds).