Hey Jake, before going to all that trouble try this quick easy solution. Take the trigger housing off to where you can get to the trigger adjustments. The last screw on the plate ... directly behind the second stage adjustment screw ... is the safety adjustment screw.
Not sure where you are presently on that screw so just try screwing that screw in or out by quarter turns. Once you get your safety working stop. If you have never adjusted it before, and it used to work, you probably will not have to turn it more than a full turn one way or the other.
I had been playing around with my trigger adjustments one day and wondered what that last screw was for. Gave it a turn and I lost my safety, it would fire while safety lever was in the safe position. Turned it a little further and the lever locked in place and would not go to the fire position. Turned it back and got the full safety working again. Really very simple, turn it slowly and by quarter turn increments until you get the safety to where you want it. Unless something is broke in there, that should do the trick ... and if you haven't been tinkering around with the safety before, more than likely nothing is broke, just out of adjustment.
