Polishing can help to reduce grittiness, and grittiness sometimes makes decent triggers feel worse.

I like shimming the trigger, but go with whatever you feel your level of technical proficiency is as well as the tools and supplies you have. A drop-in unit like the Rifle Basix trigger is an excellent choice as well.