Yes I think it's enough
Because each Bitcoin can be divided into 100,000,000 units Satoshis sats. 1BTC= 100,000,000 sats, so this means that there are effectively 2.1 quadrillion Satoshis in total
So even if Bitcoin gets to a very skyhigh price, there will be no need to hold a whole Bitcoin to your self. We can just make transactions and save in tiny fractions. so that's it, if Bitcoin had an unlimited supply like regular Money, it would lose purchasing power and value over time
I am happy that you figured this out by yourself, and if I am asked, I would say that the 21 million BTC total supply is even too much, the lower it is, the more the law of economics on demand and supply over the price would be enforced. The goal of the 21 million supply was to create scarcity, but till now, the effect has never been felt because you can easily get your Bitcoin today. I wonder where the price would have been if it were difficult to get Bitcoin and everyone held on to their Bitcoin.
That will naturally create more value!