A bit of a mental block with the last 2 more clues anyone?
25a Call Heather annoying? N---L-N-G seem to think it could be nettling or niggling but cannot fathom why!
17d Tennis star, in short ceremony, misbehaving (7)M-E-T-- Maestro? But how does that fit in with 25a t or g?