Wet weather SSCX commuter

The modulation of these brakes and the setup (after initial issues) is perfect but i'm having major problems with the pads / rotors...

Under even light braking, the discs make a horrible grinding noise that sounds oddly like a metal spokey-doke. I can feel the pads and rotors juddering against each other (like there are little imperfections on the pads...). Also, in the rain on Friday, they had the most horrendous squeal. I've had discs that have squealed before but this was ridiculous.

Could it just be a case of changing the pads / rotors? If so, any recommendations?

Did you resolve this, Tim?