Good luck, the Ms require a custom length barrel and considering how long it took for their first batch to sell, I don`t think Steyr will be doing it again. Though I think there`s still some new M40A1s kicking about; it`s the best .40 you can get IMO.
Just be ever vigilant on the EE, some very good condition and even unfired M9A1s show up on occasion for reasonable prices. It`s where I got mine. (After searching far and wide for a dealer, much like you, I imagine.)