I would suggest that, if you are not completely satisfied with the Glock or the M&P, then you should look at the Walther P 99, PPQ and the HK VP 9.
I own M&P's, Glocks and the two aforementioned brands. I carry Glocks because that is what my state and city police carry and I have shot them quite a bit. I have also shot the M&P quite a bit also. I could be happy with either pistols. The triggers do not vary that much to me.