Unless something drastically changes in the market, .40 for defensive use is essentially going the way of the dodo. Even with the shortage of 9MM today (which won't last forever).
I would STRONGLY urge that you check out some of the newer 9x19 defensive loads. My personal favorites being Federal HST or Winchester RA9T. They are exceedingly effective, lower recoil, and yield lessened wear on a 9MM as well as drastically improved accuracy on the part of the shooter under stress.
If you really want .40, I'd suggest checking out the PX4. It's the only .40 Platform I enjoy shooting outside of a full size USP in .40 personally.
FWIW, .45GAP caught my interest recently, and even that is far more pleasant to shoot in a 9MM size platform than .40 IMHO. Of course, you know what they say about opinions and how everyone has them....
Now, if we're talking about USPSA or the like, I can see your desire, but unfortunately a US Made .40S&W 90 series will not be happening in the forseeable future.