I would even argue that with lightning and e-cash as 2nd and 3rd layers, scaling has been fixed already. Sure, it's technically not perfect yet but it exists, it works *today* and it works better than most people realize, even those in the Bitcoin space. Both are also massive improvements in terms of privacy.

The only risk left in Bitcoin that I'm watching more closely is miner centralization, as this could lead to losing censorship resistance on-chain (bad, very bad)