Top right all sorted now
Just 2 more to finish/confirm..
21a Husband temporarily disliking sisiter and grand musical humorist (8)
H?F???N? possibly Hoffman ... but where does the sister come into it?
17a Having a knees-up dance to reggae or something similar, with new man (8) SK???I?G
5th letter of 21a = 4th letter of 17d