BTC is just electronic digits that are infinitely divisible so there will never be a shortage, it just depends what value you put on a satoshi. Supply is also only limited by a few lines of code that could be changed if the miners + big players decided to do so.
I'm not so sure about that. The miners + big players tried to change a few lines of code to increase maxblocksize, but they failed. You think they could succeed in changing a much holier parameter, the 21 million coin supply?
I think such controversial hard forks will only become harder to implement as time goes on.