That's pretty much enough for now on.
And if it would really pose a problem a hardfork would solve it but again it is not necessary.
Even if hard fork/upgrade was really necessary and needed I have doubt it would be done.
We can see that needed changes - scaling upgrade is neglected for at least 2 years and there is still no solution at hand.
If bitcoin can't successfully manage its own upgrades we might see grim future ahead.
Interesting, I think it will depend on the question whether financial institutions and governments will embrace the blockchain.
Not so much de development of Bitcoin itself, but rather the ecosystem around it.