i5-13600 in FormD-T1 - thermal or CPU upgrade for better fan noise

Hi all, looking for suggestion to reduce my CPU fan noise when loaded.

Case: FormD-T1

CPU: i5-13600 (undervolted -100mV)

CPU cooler: Axp90-47

GPU: 4090

The CPU idles around 60 degree w/ 30% fan speed set by Fan Control. For more CPU intense games or production work, temp easily goes up to 80-95 degree which then kicks fan speed > 80%. At this point, i think CPU is thermal capped and the fan noise is too loud for me (~45 decibel).

Looking for suggestion for a better thermal or a more efficient CPU. Listed a few options here not sure which works the best. Other suggestions are welcome. Thanks.

1. Switch Axp90-47 to AIO
2. Switch CPU to 9800x3d w/ axp90-47
3. Switch to 15L case for a CPU tower fan