iFlickr - iPhoto not up to the job

I’ve been happily using Flickr for several years now, and a MacBook and iPhoto for 18 months or so. I use connectedflow’s nice export tool, but crave for a better integration. Or at least, a workflow that fits my needs better. This is how I (clumsily) use the tools at the minute:

1. Take lots of photos, of different things and occasions
2. Plug camera into Mac (may not be online)
3. Go back to 0, or, if so inclined…
4. Edit photos in iPhoto, fiddle with levels, delete rubbish pictures
5. Add to an album in iPhoto
6. Go back to 3, or, if so inclined…
7. Export album as a set to Flickr
8. Add tags, names etc. to photos in Flickr
9. Add sets to collections in Flickr

Now, this means I’ve got 2 libraries (effectively). I’d eventually like to have all my images on flickr and iphoto mirror this, but with a sort of ‘intray’ that’s yet to be sorted.

It’s kind of tough at the minute to tell what’s online, and what’s not! A mess indeed :(

Does anyone have similar problems or any solution?

Thanks!