Yes, some corrupt data inside the HDD on the Folder/Directory tables ? Strange definitely. Yes your solution looks like the way to go... and keep a backup of all the files somewhere as well ;o), it's always better.

Admin