For me, it would had been better that Shaw had lived and helped the crew. Have Daniels sacrifice herself to save her.
Then, once Shaw's is being put into cryostatis, David reveals himself to her. I could just imagine the utter horror in her as she screams and slams on that tube. The audience would be terrified realizing David has not only trapped her but the entire ship to his macabre plan to destroy humanity.
I hope one day someone reveals the truth on why Noomi was tossed to the side.