I really think the film version is better and it seemed like a case where they were likely to become used in stage productions as well. I've seen it on stage (local production) and I don't specifically remember which lyrics they used, although I was already aware of the differences.
I was looking to see if the film lyrics have become the preferred version, and found this in Wikipedia,
In 2011, the song was covered by the cast of musical comedy television series Glee in the fifth episode of the third season, "The First Time" (aired on November 8), with character Santana Lopez (portrayed by Naya Rivera) on the lead. A minor controversy was caused over using the film version of the song, while a high school would normally use the stage version.
I'm surprised that using the more "PC" version caused controversy.