I agree with most of what you are saying, I have similar beliefs.
I think that we need to redesign society from a technological and _primatological_ standpoint because I think a lot of the extreme hierarchy and brutality we see in our world is a result of the way that our cultural frameworks handle our primitive needs such as various ways that men compete for sexual success (such as resource acquisition).
The thing that I think people are missing as a realistic concern or change is that by the time these robots are able to replace most human jobs, which doesn't seem like it will be too many decades from now, shortly after that, we have to expect that the robots will become even more capable than humans.
The robots will be smarter than people. Normal, unaltered humans will probably eventually be treated like animals. I think that people don't take this possibility seriously (to me it is a likelihood, and probably within my lifetime).
I don't think that means we should prevent the next 'species' from taking over, but I do think it means we need to plan for ways that we can integrate with super-intelligent technology in order to stay relevant. And I think that is going to be a very practical issue within a small number of decades.