That's pretty thorough - and there's some good ideas there too.

Have you read A Theory of Justice by John Rawls? A lot of what he says about designing a fair society, and what you might have to do to transition to it would be relevant to what you are talking about - even if some of the specifics are a little out-of-date.

The future needs people to think about this stuff, so keep at it.