So after handling some of the choices, I decided on the M&P Shield. I was really rooting for the XDs, but the feel of the Shield was better and I was surprised I liked the trigger more too. The XDs was heavy and mushy.
I ordered one from G and R Tactical without a thumb safety and with Ameriglo Pro I Dot night sights installed for $475 total.
Hopefully, a rr with pics to follow...