I'm working on bringing photos back up on Smugmug - which will be the primary source for most photos. I'm thinking of using Flickr more for photos I'm trying to be a little more creative with. Also falling into Flickr will be photos of more questionable content that Smugmug might not allow (such as the Folsom Street Fair photo set).
I'll write more shortly on why I chose Smugmug over Zenfolio going forward. It's just going to take me some time to encapsulate my thoughts on this subject. But you can look at my current Smugmug page at http://verbal.smugmug.com/: