I was going down that route too Ian before I saw the link with 17a.
All done. Quite a challenge and I'm up for that on a Saturday.
FOI was Brendan's hint 24a closely followed by 25d which then helps to get one word of the theme.
LOI 18d which despite being much discussed here, took me a long time to parse. COD 11a.
Not sure 7d is actually a thing. I'm more familiar with a different second word.