I have the same problem with my Interarms Mk x / Zastava. Either heavy trigger and safety or usable trigger and no safety. A couple of us had a go at adjusting it according to the diagram but ended up no further ahead. I chose to go with a great trigger and no safety.
