We can always stay ahead of quantum computing by upping the encryption standards and complexity. (i.e., Have faith that our "geeks" will be able to outwit any potential governmental threat to privacy)
The issue really is whether the government will outlaw such standards...(and even more interesting will be how they might try to enforce such a ban).
The ONLY reason for a government to be anti-encryption is because they are totalitarian. (Don't be fooled by the "well terrorists use it" argument).