Thanks guys. I ended up going with a new replacement parts kit that BM sells. It's a combination of three of their spring/pin replacement kits.
From the BM website:
We've taken our Field Repair Kit, our Complete Spring Package, and our Complete Pin & Detent Package and combined them into one "Super-Kit" that will take care of all your AR15 rifle's spare parts needs. You'll get all these parts and more: Every Spring in the Gun, including the Buffer Spring; Firing Pin; 3 Firing Pin Retaining Pins; Cam Pin; Disconnector; Extractor; Extractor Pivot Pin; 2 Extractor Spring Inserts; Gas Ring Set; 2 Hammer & Trigger Pins; 2 Front Sight Taper Pins; 2 Takedown Pin Detents; Safety Detent; Bolt Catch Plunger; Gas Tube Roll Pin; Front Sight Detent; Ejector Pin; Forward Assist Pin; Bolt Catch Pin; Buffer Detent; Trigger Guard Pin. This is a great value for only $36.95!