Yes, I'm very optimistic that this problem will be solved beforehand. Furthermore, the large corporations that build a quantum computer and then attack Bitcoin would lose their good reputation.