For anyone concerned with the Beretta safety/decocker, there are now a few options.
One option is the Wilson Combat single-sided low profile lever. It virtually eliminates any possibility of unintentionally putting the safety on, no matter how hard you manhandle the slide during drills.
An even better option (IMO) is the upcoming G conversion kit from Beretta. Beretta reps on other gun forums have said this kit will work on all M9/FS models, and will be an easy install. This changes the safety/decock lever to a decock-only.
And yes, Beretta discontinued the standard 96 and replaced it with the 96A1 to address durability issues with the 96 frame and the .40 S&W cartridge.