I am intrigued so I currently have my SAM7r on my lap which I have closely compared with your pictures. The receivers are the same the safeties are the same and what I can see of the dustcovers are the same but there is one difference. My safety comes up snug to the side of the receiver and bears directly underneath the dust cover. So there is the thickness of the dustcover basically acting as a stop. Its hard to say witjout having your gun right here to look at but I think your safety is bent out too much or is out of spec. I am assuming the dustcover is ok. In any case that is it. Replace one or the other or both and you are gtg.
In fact once you remove the dustcover and bcg the safety does rotate up like that for removal. I can tell from your pics that pin locations are the same as mine.