I don't know if the OP is still watching, but here is the answer to the 8 round mag shortage. I ordered one Monday, should be here tomorrow. It's a spring kit to convert 7 round mags to 8 rounds, without any extra length. Will also convert the 8 rounders to 9 rounds. It's getting good reviews from the guys on the M&P forum.