I don't think NMC has advanced sufficiently. Assuming 20% improvement in chemistry on NMC (which the Powerpack/Powerwall 2 suggests) vs 0% improvement for NCA, a 21-70 with NMC should have around 13 Wh/cell while a NCA cell should have 18 Wh/cell. In this scenario a Model 3 using 4000 cells would have 72 kWh with NCA but only 52 kWh with NMC. That's what NMC allows, optimistially.
(Of course, NMC isn't the same as NMC.
Tesla could go for two different NMC-chemistries. One optimized for durability for TE and one optimized for energy density for TA. But then again, why then drop NCA?)