Apple has trounced them both at the system level. Whatever M2 is will make x86 an embarassment.
I'm looking forward to running Linux on Apple's RISC-V hardware in another 10 years.
Let's also not forget that the IO die on the desktop CPUs is at least a couple nodes behind, and is the bulk of the power consumption on the chip.
The Zen 3 APUs (e.g. 5800U/H) are going to be pretty competitive, and I think Zen 4 on 5nm will keep the pressure up.