Adieu is probably better in that context too: shorter, since we're golfing, and more to the point (definitive goodbye).

You could also insert déjà, which conveys the notion of before: Elle a déjà tant dit adieu. Well, this means so many times and not too many times, so you could say: Elle a déjà trop dit adieu (8). This could also be directly translated as she's already said goodbye too much. You can drop already/déjà, but lowers drops the emphasis on before. If you do so, Elle disait tant adieu (6) works.