Actually, the fact that that part of the prophecy was cut from the movie makes me wonder how important it is, beyond expounding on the relationship between Harry and Voldemort. Neville is obviously going to figure into the next book (and undoubtedly do something brilliant), but maybe his role in the prophecy is limited to "What if"s.

Cho isn't a bad person. She's a sixteen year old who's been through a horrible trauma.