Backup software that locally encrypts data before sending it off to a remote location helps with that problem. I use Arq to backup my photos to S3, but I would feel comfortable to just store all photos unencrypted in iCloud.
I'll dive into this this weekend, I _really_ hope I didn't lose the actual files, just the indexes.