I would once again emphasize the inclusion of a 3rd Generation S&W pistol to the shopping list. I have nothing against the M&P, but there is nothing that weapon can do that a 5906/5903 cannot do just as well, and there can be a financial discount in buying the used 3rd Generation weapon as well. It comes with an external safety and magazine disconnect.

Should the M&P still take precedence in this purchase, a wiser thing to do would be to contact Smith and Wesson for a solution to this problem. Perhaps for the right fee they would be willing to modify a purchased weapon or put in an order for the same.