Things are back on track and all predictions mentioned by OP went wrong, as neither we have WW nor bitcoin went to 20k$. If bitcoin has to come to mainstream payment scenario then there is only one way for that and that is increase the adoption rate.
Exactly. Adoption is the one and only thing that will make Bitcoin greater than it is right now. Whatever rise of the price of Bitcoin due to some violent events around the world and the possibility of huge wars and other chaotic developments should not be appreciated. Its growth due to people having no or very few other options to turn to except Bitcoin does not mean Bitcoin is really great. It could only mean Bitcoin is a safe option against fiat but if only there is something else other than Bitcoin it would not be an option.