StraightR, good points but i must add that I have way more rounds through DA/SA (free ammo from the Navy and Army) than I do in my current carry weapon. And I doubt I'd buy a new Sig anyway, if I got one it'd be a trade-in.
Doc, I think the most practical choices for me at this point would be either a G19 with gadget and sights, or an MP 2.0 compact with thumb safety. The latter would be far cheaper as I could carry it stock, and put the price difference into practice ammo.
I will have to try out an M&P with a safety to see if it's shootable for me. I already know I like Sig triggers, but I've never got an M&P on the range yet, much less one with the thumb safety.