This is indeed a total pain. I’d like to find some other means of handling music in Mac and iPhone to get around it.