One thing I found useful in Windows7 was having a separate user account for my audio (and a small amount of video) so there were no pictures on the account to clutter up WMP.
This might be a way to tidy up the library by just copying over artist/album folders - and you don't have to keep switching accounts - you can give yourself access to play the music from your main account.
Glad SFC seems to have resolved some problems - it doesn't always get everything in one run so it may be worth doing it again... once it reports 'no violations found' - all good. - R.