All finished. Lovely puzzle which, as others have said, appeared daunting to start with but which was well-constructed and amusing when one saw the 'thematic derivation'.
Just one query though - in 18d, I can't see the wordplay for ENT. I'm sure it'll be a 'doh!' moment but thanks in advance.