Managing your music locally is such a PITA. If it's possible I strongly suggest uploading to a cloud service and going that route. I realize this might not work for huge collections.
ive pushed nearly 200 gigs to google music
working fine for me