Here is another solution. I believe both are consistent with the clues. This solution does not assume what I said about clue 21.
Edited by Harry: Thanks for the update, will check them both this evening!
If either is wrong, please post the offended clue. Thanks.