I use Adobe Lightroom for this; it's an image management and photography workflow app and is organised around both folder and tags. That is, it organises images on disk in folders, but provides tools for tagging images and browsing by metadata. Version 3 has built-in support for Flickr uploads; previous versions had plugins for this.
I haven't used Apple Aperture, but I understand it's similar to Lightroom.