Yeah, you're correct for the portmanteau in clue 2D!
5A I'm considering reworking a bit, or at least the structure of it. I think that the goal is to 1. make it more clear that the anagram involved is indirect, and 2. that the literal definition is more fair to piece together.
I will most likely reorder the layout of that clue and see how that goes. Thanks for the feedback!