I agree that your version is much clearer. But I would like to know what you think about double 'for'. Please allow me to change my original sentence to:
We waited for her for an hour. => A simple statement of what happened
Does this sentence sound fine to your ear?
Thanks in advance