I would really stress looking into your naming structure. I use the ${title} (${year}) {imdb-${imdb}} format for my library and the number of match issues I run into is really minimal. (1-2 per 1,000 files)
When cleaning up the file names you will need to do the plex dance otherwise plex may just see the file renamed and not try to rematch it to the correct movie.
