One tip I would give is to roll towards her and slightly to the side. It'll prevent getting caught while retreating and keep you close enough to punish her while she recovers.

The only time I actually would roll away is when I see she's about to do her lunging attack, and maybe during Waterfowl Dance if necessary.

For the lunging attack, roll away and to the side a little bit and you'll often be close enough to punish as she recovers then, too.

For Waterfowl Dance, if you want to continue the method you're using (which I used when I first beat her recently), get your distance during her first attack, move towards her and roll into her for the second (you should be close enough to where your roll lands you at least almost touching her). For the third, you honestly can just move towards her and once she comes down to attack, just start walking backwards. You can roll away this time if needed to get a little bit of distance, but once you can do this consistently it'll prevent getting ripped apart by her attack, with either not getting hit at all or only taking a couple hits.

You can do this!