Just remembered about the Genius - 1st Monday. Must mark calendar.
Not too tough & thankfully the over-all solution is not entirely reliant on the extra letters. However, it would be nice to justify them all.
To recap: category A - 2 letters; B - 1 or 2.
Answers:
9A B, 2
21A B, 1
7D A
8D A
17D 18A, 2
23D B, 1
Clues:
20A B, 1
22A A *
19D A
So, 3 clues unaccounted for.
* @jws (post 7)
22A - the letters
are adjacent, within the 2nd word of the anagram.
@ peterm & ixion.
5A doesn't appear to need extras. Anagram L + BESIDE. Is "cry" an indicator?