Let's wait and see the detail. All that says is that 617/809 should both be available for QE/PoW ops in eight years time, with a nominal 12 cabs apiece.
What is of higher importance is the ultimate planned size of the F35 force and Typhoon force combined. Extending typhoon T1 gets some way towards retaining FJ mass - it's what happens with the GR4 to F35 transition and the size of that force that matters.
Good news on MPA though!