I am in the same situation. And converting from Windows to Mac. Don't know your situation, but at this point I am using Windows SyncToy (free) to get all my images in one location. What I need now is something to check for exact matches for folders I have copied out, but still are duplicated in my normal heirarchy...
So, I too, am open to suggestions. (and there is still the question of the library:)