AIO for Razer Tomahawk Mini-ITX

Hello! I have a Razer Tomahawk (Mini ITX) but i have a problem with the AIO Cooler, CPU temps reach 60-70 degrees on idle and 100 degrees when gaming (causing thermal throttling) and the PC shutdown. I have a MSI Mag CoreLiquid 240R, this is the second aio replacement (the first one had noise on pump). I've already tryed to replace the thermal paste but i'm pretty sure there is some problem with the AIO (found a lot of forum threads over the internet with the same problem as mine) so i need to replace it with another one (240mm). The rest of my components temps are more than ok, also with an RTX 3070 TI, all temps are really good (Cooler master fans). I have an i5 11400, i think is impossible that my CPU temps are so high. Anyway, i just need some suggestion based on my PC case (It must fit correctly). Air or AIO? What do you suggest? I just found this, need some advice on what to buy for my case / CPU: Razer Hanbo Chroma 240mm aRGB Cooler Master Masterliquid ML 240 Illusion Corsair h100i Elite LCD Thank you!