Question about NZXT Octopus M22

That's just a 120 AiO, which is hardly better than a 120mm tower cooler. I would generally only use a 120mm AiO in ITX builds where there is no room for a fan cooler.

If you don't want to change the cooler, I recommend manual overclocking/undervolting of the Ryzen, the temperatures are mostly due to the high voltage (depending on the setting 1.4 - 1.45V at idle, even higher under load) and PBO (Precision Boost Overdrive, which lets the CPU briefly operate above the preset limits), you can easily reduce the voltage to 1.325V and lower for better CPU temperatures.
Alternatively, you can limit the package power in the BIOS, which reduces the general load and results in lower temperatures.
Here is a relatively simple guide on how to do this:
https://www.youtube.com/watch

Alternative new cooling:
For the price you can already find 240/280/360 AiO's with much better cooling performance, provided your case allows it:
Arctic Liquid Freezer II 240 (6.30 cm)
Arctic Arctic Liquid Freezer II 280 (6.50 cm)
Arctic Liquid Freezer II - 360 (6.30 cm)