"You are forgetting the next part of the prophecy, the final identifying feature of the boy who could vanquish Voldemort....Voldemort himself would 'mark him as his equal.' And so he did,Harry. He chose you,not Neville. He gave you the scar that has proved both blessing and curse."
But again, that could mean anything.
It doesn't necessarily refer to the scar. I know that Dumbledore believes it does, but I don't think it rules out a Lord-of-the-Rings type twist ending at all.
Just my guess, anyway!