I remember going thru a minor hell when I moved my main Zune installation early last year. It took a level of effort that I don't really want to commit again. Moreover it's not moving to a 'real' PC but a Boot Camped Mac - though hopefully that shouldn't make a difference (though you never know with Boot Camp).
Is there a way to move a Zune install, with all metadata/etc intact? The tracks Zune references are on a WHS, but the stored file locations won't change.