Mine was set up just like yours and I ended up getting the CGW adjustable sear to correct it. Not only does it restore the use of the safety it also gives the trigger added smoothness and better function.
It's beer heaven here in San Diego. I've forgotten that "corporate" beer even exists. Once you have a Stone/Ballast Point/Ale Smith IPA...paradigm shift!