In a situation like OPs, where we may be fiddling with the library a lot, I don’t bother with the Plex Dance… I delete the whole library and re-add it, turning off every option that has to do with sonic analysis, tour dates and that kind of thing so it goes quickly. Of course this is only reasonable if there aren’t playlists and history to be preserved. But I have found this way to be a bit faster.
I would definitely not use dashes or anything like that in the directory names. Give Plex exactly what it is asking for. Plex is fussy when it comes to music. If you break the rules bad things can happen.