Yes, this has been a real slog. Lots of cold solving and even when down to the last 3 or 4 clues it was difficult to say which vacant entry spaces belonged to which clue.
I had a couple of inspired guesses in the end that saw me over the line. Phew! And thanks toPpicaroon (I think!).