The Popcorn C-200 is probably the best gadget-purchase in a while and I have been able to organise my movie library quite well. Although the Popcorn currently lacks proper media indexing, Yet Another Movie Jukebox allows you to index your complete library and presents it as an HTML frontend with proper Popcorn integration:
A constant struggle with TV episodes is always the naming of files and the great Java application FileBot does an amazing job:
FileBot will recursively scan all your folders, match episode names from online providers (such as TVRage, AniDB, TV.com, IMDb or TheTVDB) and rename the files accordingly. With that in place, YAMJ (which also is pure Java) will then go off to the same providers and fetch detailed episode plot-descriptions, pictures etc and makes the movie experience truly awesome.