Typical, just been paid, all set to finally sort my sounds out with new headunit and speakers all round, and think i've got an ABS problem

Basically, got in the car the other day, ABS light stayed on for the entire 1.5hr journey. Seemed to drive ok. Next day, ABS light stayed on when started the car, then went out after about 15mins. Since the light has gone back to normal (comes on at startup then goes out after a second or two) but when slowing down for a junction I intermittently get a strange grinding / clunking noise as I brake, and the pedal depresses (goes a bit limp!) a bit for a moment. Is this the ABS kicking in? If I brake really gently it doesn't seem to do it. It only happens for a few seconds then drives as normal.
A couple of weeks back I had a stone trapped behind the disc which was causing a right racket. Is it possible that it could have damaged the ABS sensor? If so would this match the symptoms above? And if it does sound like dodgy sensor I suppose its vagcom or diagnostics to prove it is it?