>and the advantage the M1 has in both of these metrics is pretty much exactly the difference expected between a 7nm and a 5nm process (they’re both being produced by the same fab, after all).

Maybe, maybe not. There's no reliable way to estimate exactly how much improvement AMD would get from moving their design to the same fabrication process that the M1 is using.