This seems like a good deal on the 40, which if I recall never had the accuracy issues of the 9s.
The M&P45 is the best shooting and best form factor for a 10-13rd 45acp polymer handgun in my opinion. Accurate, reliable while being much closer in size to the 9/40 cal platforms.