I'd also try downgrading the firmware. It's kinda weird in my case, but downgrading the firmware helped me significantly on the P25 Phase 2 simulcast system around me. I downgraded from 5.8 to 5.3, with the modern DSP firmware, and it's proving better. That might be a suggestion you could use as well.
