Bitcoin is making a comeback in the form of Bitcoin Cash. Following the original design to scale it now is ready to serve the world.

The BCH community has been rolling out some serious upgrades over the past few years.

Bitcoin Cash Upgrade History - https://minisatoshi.cash/upgrade-history

This is correct. By the time quantum computing is even close to being usable the blockchain software will be updated and it will not be an issue. This is especially true for Bitcoin Cash since it is the Bitcoin that ships upgrades continually and is not ossified and resistant to change like BTC.