I have read somewhere that it could also be caused from missing jack point "blocking" bits. Have a look under the side guards where the jacking points are, there are supposed to be some bits of plastic or rubber covering some holes. If these are missing, air rushes in into the cabin and it sounds like wind noise.
I have this very issue with my car, I haven't bothered to check if what I wrote above is the case with me though.
My wind noise sounds like its coming from the front windscreen, and definitely not from the sunroof.