i7-8700 cooling

Hi all, I'm in the market for upgrading my cooling solution within my PC. Recently, I upgraded my CPU from an i5-9400F to an i7-8700 (non K version) and it wasn't the smoothest transition (see profile for other thread asking for help) which is likely due to my inadequate CPU cooler. I've...