FIrst, before I answer the question, thanks for a stimulating discussion.
Mainly I think technology will have clear distinctions between cyborgs, androids, AIs, video games, augmented reality, and so on. Rather I think it will almost be soupier in nature, with an weird blend of different technologies for immersion.
Consider a tabletop game, that traditionally has pen, paper, and maybe a cardboard dungeon: already a lot of our old technology in some areas are being updated, even though it's really the same game. I don't think board games will ever really go away, simply be forced to adapt to a climate where augmented reality, virtual reality, and some odd slipstream in between will force the old form to change.
Even in robotics, I've written one type of thing where it's not super clear if she's a cyborg, android, ai, or something else: she's an AI brain in a metallic skeleton, with 3D printed silicone human-like flesh. It kind of messes with traditional ideas of where cyborg ends and androids begins.
More things like this.
Additionally I feel that the distinction between fiction and reality will blur as well.