With the battery swap Tesla has finally alleviated the "cross-country road trip" problem in a way that superchargers really couldn't. Now when you are comparing car vs. car you have no reason to turn your nose up at electric. And with Tesla making the best cars ever in the luxury sedan price range, they will likely do the same as they scale and create an economy car. The cost of batteries and production will continue to drop until the only real choice you're making is Tesla vs. Chevrolet. And Tesla makes better cars.
If I weren't a broke startup founder I would pour in all my money to Tesla stock.