Just bought new discs and pads, I'll fit them tomorrow. Changed the front wheels to the back and vice versa, this seems to make the wobble a bit worse.

Fitted the old wheels and it's a lot better, but still there.

Doesn't seem to be CV's (I hope!) The wobble/vibration gets worse at about 50 and over but up to 50 seems rough through the floor pan (maybe just the tyre noise I'm not used to though)

Cheers