So in the end Hibiki got plot armor to save his life again, yet unfortunately, it's because another guy popped in rather than his sister actually being alive or him actually personally stepping up in some way.
In any case, I'm hoping that the foreshadowing about D taking the stage here means that he's about to win some battles epically. It would be even more awesome if he teams up with Hisui. I guess we'll see. This whole massive fight is just so complicated.