No, not finished yet - hit a brick wall. I've REP??O currently for 13ac. but there are clashes (I have two in 17/18ac).
I was thinking REPUGN for 13ac. but can't justify wordplay.
Also have currently N??ORS for 14ac. but expect clashes!
I still have 8 clashes to find; still some way off.