That's a pretty good bet, as Amazon is already sitting on a 1.6T market cap. Tesla is at a "meager" 342B$.
Tesla's current valuation has almost nothing to do with its automotive business.
I used to think it's a good idea to ditch cars and use public transport and bikes, but now I don't think I want to ever use public transport again. The personal car is a protection shield against infection, and for that reason I think many people will turn back to them.
I don't disagree with your assessment re: infection, but I'd point out that transportation overall is dropping, possibly permanently; and that the long term economic damage from the pandemic and the debt loads that we're taking on will likely hurt auto sales for a long, long time. I'm not sure that whatever shift away from mass transit to private vehicles will make up for the overall loss of transportation, and you have to have a job to go _to_ in order to need a car to get there.