I'm also looking to escape Flickr, and still have yet to find a good self-hosted solution.