The change to M&P2.0 deal sounds pretty darn good. You must have a good sized dept. When we switched from Sig 226/40 to Glock 22s were paid $100 to swap out guns,holsters and mag pouches. It was easily passed by the PD and city council and we got better gear going to Safariland holsters and mag pouches from leather Gould and Goodrich holsters and leather mag pouches that covered 90% of the magazine. This is back in the mid 90s.
We also had the issue of lack of scanning or even more "interesting" the tactical speed neck stretch where guys would look and not see. We rectified that by requiring the scan to qualify regardless of shots on target or time and enforced it by ROs holding a blue or red gun or rubber knife in the center of their chest after firing a stage began. We would randomly ask officers what type and color simulated weapon was the range officer behind them or near them holding. If they got it wrong they were considered DQed and had to shoot the course again. Guys that hate shooting got good at scanning more thoroughly but we also had a couple guys that liked shooting try and play it that they didn't know to get more trigger time. They were also the ones that didn't need reminding to scan properly.
Does your agency not have a policy to investigate NDs? It was in our G.O.s and would result in discipline in most cases and always if it was a Dept weapon or anything was damaged. The file cabinet in our cleaning room was a reprimand for the RO and the new recruit who shortly after resigned. There was a guy that had a ND of sorts when a round discharged as he cleared the chamber with his hand over the ejection port(Sig 226/9mm) in his living room while he was off duty. He had minor cuts to the hand from the case failure. It was investigated and believed to be when the primer was hit by the ejector. He still got a written warning.
Our dept didn't put much effort and money in to firearms training all the time I was there but they did take safety pretty seriously at least.