I'd vote to stay with what you already have, provided you dont mind changing out the grips/stocks/etc....some people dont wanna mess with that, and at times i get lazy too..i have several frames i keep for handgun barrels, and 2 set up as carbines, but i am a barrel hoarder, and it really doesnt take that many...
as for triggers, the a properly adjusted G2 trigger feels pretty good to me, although i personally like the looks & feel of the older style frame myself. I have bought several G2's to get either the barrel or the scopes, but always ended up trading the frame off & kept my old ones. i guess old habits die hard...