Wrong order. Ammo, Magazines, Optic
For an HD weapon, add Sling and Light.
I'd skip the trigger job and learn to shoot the stock trigger, first. The stock trigger is perfectly serviceable. Besides, in a SHTF scenario, if you pick-up/scavenge a rifle somewhere, the odds are high that it won't...