Cross with myself on this one. Got the grid, bar a couple of crosses, in reasonable time and then resolutely refused to follow one particular line of enquiry.
Many rabbit holes later, I finally looked where I always should have done.
Clever puzzle, with typically tough clues, and a satisfying endgame (at last). Thanks, Sabre.