This is what I do, and have never had issues.
For movies, I have a folder called Movies.
Then inside that, a folder for each movie.
E.g. inside Movies:
\Sin City (2005)
Sin City (2005).avi
Sin City (2005).nfo
Sin City (2005).tbn
Having years next to your movie greatly assists with scraping... and in the library on XBMC when you're using it, the year doesn't show up next to the title, so you don't even know it's there.
Check out my post in this forum (Help and Usage)... link here
Do what I suggested for tv shows and you'll have no problems... if you want them to be different you'll have to look things up... renaming all your tv shows to something that will DEFINITELY work (what I suggested) might be quicker than looking up what you'd need to do for your own naming convention