I found your estimates for wrong and the real number should be significantly lower.
For example, I have over 10 BTC wallets with some dust and little over 0.001 left from different payments, mixing, gambling and so on. I'm sure that everyone who's dealing with crypto currencies from few years have few like those.
So I think the real crypto users are just a few millions. The technology is still too complex for ordinary users and mass adoption. You grandma could use a CC, but crypto? Or even your parents?
What most people don't get is that we don't even need mass adoption to get the price up x10, we just need the individuals with high net worth to diversify their portfolios into Bitcoin.
Most money in the world is controlled by few individuals.. so why the hell people want "mass adoption"? average joes putting their small savings into Bitcoin will do nothing, we need the big pockets to diversify their stupid stocks and bonds into Bitcoin and eventually this will happen, but people are too focused on how we need to pay coffee with Bitcoin to "go to the moon" which is nonsense.