"Trains and buses are much more efficient at moving people than individual cars, even if they're self driving"

Dubious claim that needs evidence. I think you're underestimating the potential throughput gains from autonomy. As just one example, speed limits can probably be greatly increased when you take the realities of human reaction times out of the equation.