My understanding is the current Broadway production actually made some attempts to meld the two - the 1956 film, and the 1990s film. I was describing the film to a friend who'd seen the musical recently, and she says it ends at the same moment and the same last line. (But is not anywhere near as ambiguous.)