The solution is to use strong encryption all the time. When it becomes the standard mode of operation for the majority of people, protocols, and applications, it will no longer be suspicious (and therefore probable cause) for a warrant. Let them subpoena the encryption keys in court or burn CPU time trying to crack things they find important. Encryption will help resist indexing and slow down data mining, bringing back some of the privacy and freedom we used to have.
Caveat here that the crypto needs to actually be good, and key management and negotiation needs to be good, and key sizes and algo parameters need to be good, and that hardware needs to be good, and that key escrow systems ("Secure" Enclave, "Trusted" Platform Module) need to be good, you can not use computing services - everything must be done locally (the third party doctrine means that copies of this data must be kept to be made available), and the software stack must be kept secure and the hardware must be trusted.
