I tried with C1 state off, no change, then I turned every single C state off, and that actually did stop the whine. But im a bit of a tart and dont like the idea of having to do that, so it's gone back for an RMA today anyway (there was another issue with restarting the machine too).