The Ultimate Flickr Tool – HELP!

I am looking for an desktop/offline solution to manage and organize my photo library, and have it sync up with Flickr.  Sounds like it should be easy, doesn’t it?  That’s what I thought until I had gone through quite a few photo managers and Flickr compatible uploaders that hadn’t fit the bill.  It forced me to stop and really look at what I needed from this kind of software.  So, here’s the list.

1. A desktop version of Flickr’s built-in photo manager.  -  This is a really good start but there is still a few things missing.
2. Manage/edit my photo’s metadata (xmp, iptc exif).  -  The ability to add custom fields to the metadata would be a plus but really not that necessary.
3. Remember all tags, sets, and collections currently up on  my Flickr account.  -  This would negate the problem of creating multiple tags, etc, for a group of photos where only one is needed  (i.e. “CedarPoint” and “Cedar-Point”).
4. Lastly, added ability of Flickr’s own uploader.  -  Setting privacy permissions, batch uploading, etc.

I had thought this would have been an obvious list for most people too, but it must not be because I have yet to find a solution that fits the bill.  I’ve Googled, downloaded and tried everything I could get my hands on that even remotely seemed like there was a chance that it might work.  I guess I was hoping someone might stumble across this with a solution I could stomach.

**crosses fingers and waits expectantly**