I'd also like to say that the fight was some pretty genius storytelling once you get the full picture. Two sides of the same coin were responsible for Masaki's death, Grand Fisher, a Hollow that directly killed her, and Yhwach, whos actions lead to her death, which was preventable through the powers he stole.
Ichigo failed to beat Grand Fisher, yet Grand Fisher didn't kill Ichigo, which sort of eludes to how Hollows aren't his true enemy. This is proven as we see Zangetsu, the real one, was in fact the Hollow White, who also was responsible for Ichigo's existence as he was the reason Masaki and Isshin met.
Meanwhile, Yhwach, who is the sole reason for her death, was killed by Ichigo. Although Quincy Zangetsu ultimately nortured Ichigo's growth with White, he was merely an assistant, as he didn't know the full extent of Ichigo's power nor did he allow Ichigo to tap into it. This partially was responsible for Ichigo's death at the hands of Ulquiorra, which White had saved him from, paralleling how Masaki's death was at the hands of Grand Fisher, but Yhwach stopped her from fighting back.
Ichigo failing to kill Grand Fisher eluded to how Hollows had a lot more of a positive effect on his life and it also showed that he should have compassion for them, since Grand Fisher could've killed him at the end, but chose to run, which Ichigo shows this level of mercy when he beat Grimmjow and refused to kill him. And killing Yhwach was his true fufilment of revenge, but also acceptance as he had led himself to accept Yhwach as Zangetsu, and never showed long-term animosity towards Uryu, even after his betrayal.