Regarding the third point, for bitcoin to be an analog to gold we must keep in mind that gold is universally known and valued. If bitcoin prematurely choked off its own growth and abandoned efforts to mainstream it, I suspect it would slowly wither and die as competing altcoins rose to take its place as an everyday, mainstream cryptocurrency.
The current price of bitcoin is based largely on expectations of future growth. Choke off that growth and I suspect a large portion of its current valuation will evaporate.
It is also important that you reconsider this myth that capping Bitcoin's transactions is a cap on its userbase.
Bitcoin, as is, can provide a refuge for the wealth of ANY person on the planet. It can currently accommodate an infinite amount of capital.
The distinction is important because reality shows us that actual Bitcoin users are by and large not much interested in transacting or spending their coins. A great majority of the coins in existence have been and should continue to sit pretty in their cold wallets for years to come.
Why should we expect this to be different for future users? If you believe, much like I do, that the next trove of adopters is likely to be institutional investors with an interest in Bitcoin as a commodity/asset then why should we be worried so much with the system's transactions throughput? Do you expect the Winklevies to go on a shopping frenzy with their 100,000 coins? The analogy with gold is tired but it remains true: it should be expect that most bitcoins in circulation will be stored in digital vaults and shall remain untouched for a long period of time.
All of this is to say that you should stop focusing on "mainstream" users and what you assume their interest in Bitcoin will be. We should expect these to be last in line in your mass adoption scenario.
You make a valid point that a large number of users can still adopt bitcoin IF the transaction velocity of the money supply remains low enough. But this doesn't address my point that gold has a high value in part because everyone values it. To get to that point I think the average person needs to have some kind of tangible contact with bitcoin, obtaining and using it at least occasionally. And that would mean that mainstreaming of bitcoin as a payment processing system has to come first. The digital gold function (with the implication of high value) would derive from that success, IMHO.