Phew. That was hard. Finished it but it has taken most of a 2 hour train journey. FOI: 21d (I started in the middle for some reason). LOI: 5d. COD: I enjoyed 13ac, both the process of working out which words to use and also the end result. Thank you, Boatman!
Interested to find out from this forum that comic Dave is a setter!