I've been working on this off and on again for years, but having my laptop die this month required me to move all my files and rethink my organizational systems for files in general. So now all my photos from 2005 onward are in the same place by category/subject. It should be much easier to find photos from now on.
The final stats are:
100,694 total files