I don't think you can go wrong with either of the trigger sets that you mentioned. I put a drop in kit in my AR and certainly appreciated the drop-in ability. Also, the enhanced kit from Spike's seems to be a good choice as well. If you do go this route be sure to let us know what you think about it.
Magpul is coming out with a couple variations on their popular stocks. They are the ACS-L and the STR.
http://store.magpul.com/product/MAG378/170
http://store.magpul.com/product/MAG470/171
I'm going with the STR for the large amount of cheek weld real estate.