I do not agree, not because ally sound worst than friend - at the contrary! - but they were friend at some time in the past (at least accordingly to Jyn’s dream), while I intend ally to be better used in a war context - yes, I know this IS a Star WARs film, after all! 😄
About the other word:
