I haven't really been following the Dropbox fiasco(s), mostly because I've been so happy over the last year with SpiderOak (https://spideroak.com/). They go out of their way to put you in control of your data. They don't store any passwords whatsoever, encrypt everything, and have a strong zero-knowledge policy.