<<I still think Uber has the right idea long-term with a completely autonomous fleet>>
I agree that this is probably the end state of this space, but I think this is much more Google's than Uber's vision - Uber is terrified of autonomous cars (since it eliminates the supply network effect of their driver network and opens up the space to anyone with deep pockets).
Once autonomous cars become a reality, I think you are going to see a fierce battle between Uber and Google.