I guess we can discuss Cybermen (cyborgs) and Cylons (both) in this topic too.
I have to admit, I didn't watch the new BSG through to the end - it was too depressing. I am not sure how the cylons fit into the picture. Some of the advanced forms were indistinguishable from humans*, but are still in some real senses "artificial". These challenge our definitions, and demonstrate there are cases that don't fit neatly into one category or another.
Cybermen are cyborgs, pretty clear and simple. They still even have to breathe.
Daleks are in that middle space - there's an organism inside that controls a metal shell, but it is unclear to me whether they are dependent upon that shell for their life processes. They're on that cusp between "person in a tank" and "cyborg".
*How could you not note the differences that lead to a spinal column that glows? I mean, really?