Update:

The shop skimmed the rotors to try and even them out as best they could. They told me that the discs were bad......soo bad that after the skimming only 50% of the brake pad was touching as a result of the uneven wear bought about by the warper disc. They said to drive it for a few days and bring it back so they can check the wear. I took it back in today and they told me that they werent happy with it and i should really put in new discs and pads. so now im getting new OEM discs and pads fitted and i'll have it back this afternoon.

Oh yeh, the disc skimming fixed about 90% of the shake/shudder upon braking. Hopefully with the new discs and pads it'll be 100% gone.

they gave the option of non OEM discs that were cheaper. I told them to use OEM, am i right in thinking thats the best option?

cheers