I don't see Tor becoming any more mainstream, even I only use it for a few specific purposes - like connecting to my bitcoin node. Tor's time was in the 2010s and it never stopped. Unless there was a complete rearchitecture that solved bandwidth and DDOS concerns, normies can't stand slow internet.