As soon as Waymo's massive robotaxi lead became undeniable, he pivoted to from robotaxis to humanoid robots.
The key question is whether general purpose robots can outcompete on sheer economies of scale alone.
Purpose built, that probably takes the form of a humanoid robot since all of tasks it needs to do were previously designed for humanoids.