You know what, I think that combining Holloway's death and Fifield's return will be completely effective. It would help make the story much more cohesive in general. Fifield's story seemed especially tangential to me and having Shaw kill him would help tie it to the general plot line. Additionally, the pay off of Vickers killing Holloway would work out much better, being caused indirectly by Fifield; Holloway's sacrifice would have more resonance (with the audience knowing the consequence of his infection), and Vickers wouldn't be as cardboard. I wonder if it was resuffled since last minute, someone was afraid that it would be awkward for Holloway to be suffering while Shaw fights Fifield.
That change would certainly assist this muddled section of the movie. Another scene that seemed awkward to me was when the Captain was telling Shaw about Fifield. It struck me as a possible post-production pick-up scene. If the change Bingo suggested is true, this is most likely the case. The dialogue wasn't particularly good. It interrupted the flow of the movie: being sandwiched between Weyland's unveiling and Shaw's much better acted and more relevant conversation with David; it annoyed me the just-aborted "pregnancy" was completely ignored in that scene.
Anyway, Prometheus is a movie I actually want to like but I just can't in it's current state. It screams for a fan edit. With a little FX work and whatever deleted scenes the BD bestows upon us, I have no doubt that this movie could be really helped. The sheer strength (I believe/perceive) of this possible sequence helps validate that in itself.