I'm a little more optimistic than this. I think mass adoption will eventually happen, only because the fiat legacy system will collapse under its own debt. There has to be some kind of alternative, because money is needed for civilization to continue.
But, it's extremely unlikely that mass adoption will mean everyone is self custodying their bitcoin. The biomass will still most likely opt for third party solutions for their bitcoin, they'll willingly do this, won't even have to be forced on them.
Just gotta make sure the early adopters interact and use the network and 2nd layer protocols permissionlessly and in a sovereign way. We gotta cultivate that toxic culture and pass it on to our kids and followers. We are the Sabiqoon!