So, Flickr is nice, but my OCD won't allow it.
Once upon a time, I tried out Picasa. I hated it. I hear it's better now, so I'm going to give it another shot. So far, my biggest complaint is that they don't allow subfolders... I think I can work past that. The problem with not having subfolders is that I arrange all my folders within folders. For instance, I have a main folder called "2011". As a subfolder, I have "Summer 2011". As a subfolder of that, I have the random adventures I have had this summer like "Moab 0622". In each of these final folders, I have an "Edited" folder. So, in all I probably have like 15 folders with the name "Edited". Since Picasa won't allow subfolders, I now have 15 folders with the same name... so I have to go rename them all.
Once I get through this renaming process, I think I will be much happier with Picasa than with Flickr. But time will tell.