Though as nice as it may be, it is really strange, the engineer ripped David apart, did away with the doctor and "red shirt" guy - only to have problems with Shaw?

He could also with ease crush her, not play games, and somewhat the logic, why he hunts her, kind of escapes me (she wasn't hostile, the others were, and at that even towards her)

so yes, I would leave that "end battle" out - question is should Shaw live or Vickers, what about David?

And cool to close with the "distress call" ;-)