I'm frustrated as well.

I currently have two accounts.

Both are Flickr Pro.

I am considering Smugmug, as that has been recommended to me by a friend.

Flickr is annoying to me at this point in many ways, especially since they left no "back door" option to the old version.

http://www.smugmug.com/