Yeah, I kind of agree with you on counting down the hits. Thankfully, it's only brought up more more time at the beginning of next chapter and then it's never mentioned again.
The fight gets a lot more interesting starting from next chapter in my opinion, so that's good.