I've finished apart from two non-themed clues:
18D composer could possibly agree with Mr Cross (3,5). I have -A-/ R-G-R. Looks like Roger (agree) but I've no idea for the whole.
22D One pointer's rough beard will! (3,4) I have R-D/ -A-L. Looks like red ball ( anagram of beard'll) but I don't get it!
Help!