Since the gun has already been frigged with a bit I'd say replace the bolt shroud, and since you don't like the trigger replace it with an aftermarket that has a side safety. Alternatively replace the bolt shroud with a new one that has a Win M70 type safety and get used to the trigger. Two-stage triggers take some getting used to but the ones I shoot aren't bad. Your mileage may vary, and either way you're looking at 150-200 bucks.

Nick