I've been thinking about it and I highly doubt we will see a M2/M2X based on the firestorm core sucessor.
Apple seems to have a very strict cycle of refreshes with a node shrinking with refined architecture followed by a new architecture. AX designs seem to be on a two year cycle that follows the refined architecture.
A10 - New process / Refined architecture > A10X
A11 - New architecture
A12 - New process / Refined Architecture > A12X
A13 - New architecture
A14 - New process / Refined architecture > A14X/M1
which leads me to think
A15 - New architecture (ARM V9?)
A16 - New process / Refined architecture > A16X/M3
This could mean we will only see improved single core performance in late 2022/early 2023, which could put them at a disadvantage against Intel/AMD with the Zen 3+ refresh and Alder Lake coming late 2021/early 2022. But it would also mean the single core performance improvement would be akin to a two gen improvement, which judging by apple's impecable execution could put it quite ahead of the pack when it does launch.
What are you basing your claims about which ones are "refined" architecture and which ones are new architecture on? It looks to me like you're trying to fit Apple's SoCs into some sort of Intel tick tock strategy. Where's the evidence for this?
Just based on timing alone I think it is a slam dunk that whatever they call the upcoming chip with more cores that will go into higher end versions of existing products, as well as products that haven't gone ARM yet like the 16" MBP, it will contain "Firestorm successor" cores from the A15. Why would they wait until mass production of A15 SoCs has begun to release something containing A14 cores? Don't you think having a newer core (whether or not it qualifies as a "new" or "refined" architecture to you) makes sense in what will become the "high end" offering for Macs that currently use the M1?
If you have a choice between a Mac Mini with an M1, or paying more for the high end version, wouldn't you expect to get more than improved multicore performance but also get at least a little bit of single thread improvement? I mean, I suppose it could simply be clocked higher due to N5P's process refinement, but I don't expect them to pass up the opportunity to give it IPC gains from a new core also given that the timing makes that an easy decision to make.
Anyway Apple has no reason to care how they stack up against any of AMD's products, that's something for benchmark obsessed Anandtech readers to worry about. Just like people aren't switching from Android to iPhone because Apple's phones have faster CPUs, no one is going to switch from Windows/x86 to Mac/ARM even if Macs beat both Intel and AMD CPUs. Apple's primary goal is to insure every ARM Mac is faster than the x86 Mac. I'm sure their secondary goal is to beat every Intel alternative, just to stop any potential claims of "they are giving up performance by switching they could have used this Xeon xxx or i9 yyy". Since there is no credible claim they ever considered using AMD CPUs in a Mac, I don't think they give a damn how those compare. That's Intel's problem to worry about, not Apple's.