Ugh: just realised 21A/22A can't be right because the letter numbers are wrong in either case. And she doesn't fit with any of the 5-letter clues. Except 3D ends with the right letter and from the clue it could start with the right letter - but the 'drink' doesn't fit, does it?
This is too painful. I'm giving up.
Good luck, guys.