Many thanks Lie in King. I was thrown because I had "trooper" for 17d. The clue is Stormy dancer? (7) Do you have that one please?
Am also stuck on 16d Initially had a rich wine in church - port! (7) Am presuming it is another anagram of church plus I, but again, am being particularly obtuse this evening! I have done the rest of it though!