I think the fact that Walter is more straight forward could be his downfall.
Unless the upgraded Walter can do some neat tricks David can't.
There were reports of either multiple robots or Davids (can't remember), but I have a feeling we'll see somebody whose name begins with "E" - either created in the image of Elizabeth Shaw, or somebody/something else.
+/- some David-created abomination that is neither human, nor android.