Sometime in the next10 years (or whenever) bitcoin is going to be forked where the fork becomes the new bitcoin, that's for quantum. That’ll once again demonstrate that nothing about bitcoin is “locked in”. It's software that gets updates, that's what it is.
It's not whether you or I would get behind a fork with a different number coins, it's whether such a fork could happen before all the coins are mined. If it could happen, even in circumstances we'd find hard to imagine in 2025, even 50 years from now, then it's just not a hard limit.