While I was replacing the front discs & pads, I put a piece of sandpaper up against the rotors and kept spinning the hubs backwards and forwards, the I sprayed the whole lot with electrical contact cleaner. The ABS light now goes straight out. Result

I didn't get the sandpaper anywhere near the end of the sensors though as I think they're a bit sensitive.