Well, there are some things we could do for 1. - switch to an algorithm not vulnerable to quantum computing, for example. I think NTRU would be an example of this.