Yeah, I hate the automatic download. I tend to categorize by year/month plus specific categories.

I guess I like the catalog style apps because they expose so much more of the EXIF info and can act on it.
The latest breezebrowser give you all of the histogram and can edit it. It also does the RAW conversions.

The G5 also lets you voice tag images and cool stuff like that. Unfortunately, the XP camaera wizard junks all that. DOH!
There is an ideal solution out there somewhere, I just know it.