Almost there. Beaten by one thematic. I shan't give its clue number at this early juncture. Hints may appear later!
Only other issue I have is with the first letter to be corrected. I have "S" but that isn't correct, and I can't see where the one I need is hiding in the clue.
I actually quite enjoyed this, but agree that some of it was tortuous - certainly not as elegant as last week.