> The web app is speedy, download times are great, and with the encryption I'm a lot more comfortable storing private docs than I would be on Dropbox.

You shouldn't be. Their "encryption" does little more than provide them a way of saying "We can't comply with your subpoena because we don't have the user's key!"

Granted, Dropbox's security is pretty laughable too.

Your best option is probably to store e.g. a TrueCrypt container in either service. (Dropbox will only sync the parts of the file that change, so there's that. Pretty helpful if you've got a 1-2GB TrueCrypt container.)