Human ....
I agree with your general idea, but when it comes to human vs non-human, I think we should retain the notion that a human is a biological being produced from a fertilised ovum, where the ovum and sperm are generated by humans. Or at least that the being in question began it's life in this category.
What we need to get away from is categorising behaviour as "human" when we mean "intelligent". Lumping it all into "human" makes the term useless. If we do this, then we'll need another new term for biologically derived humans.
Now, if we augment ourselves, or even move ourselves into a digital universe, we don't stop being human in my opinion. So, the current substrate is not what's relevant, it's all about how the being came into being.
2B|!2B.....
