Cap...

Several based on short stories, in fact.  Mostly in the "newer"
incarnation, the one in the 90's:

"The Human Operators" - AE Van Vogt & Harlan Ellison (1999 airing)
"Inconstant Moon" - Larry Niven (1996 airing)
"The Sandkings" (ooh that was creepy!) - George RR Martin (1995
airing)
"I, Robot" - Eando Binder (1964 airing)
"Soldier"  (yeah - I was surprised it came from a short story...) -
Harlan Ellison (aired 1964)

You are, however, mostly correct, as far as I can see.  Most were
written as screenplays.

There is one, too that I saw (can't remember the name at all) about a
(cyborg? modified animal like a wolf?) who was a "hunter" or an
assassin.  Only remember it because I had just got done reading the
short story several weeks before - then saw this episode.
-- 

Wes Struebing
+++++++++++++++++++++++++++++++
"No matter how high or great the Throne,
"What sits on it is the same as your own."
E.Y. (Yip) Harburg
--- SBBSecho 2.12-Win32