See, you could say Yuri and Naoi ended up disappearing fulfilled. and get rid of the graduation series. Then there would be 4 people, so she wouldn't do the soccer segment. In other words, the 2 couples find peace together, and Hinata and Yui would have a higher chance of being together in the next world, like Otonashi and Kanade did.
They could have kept Hinata alive, along with Yui and Otonashi and Kanade, made episode 10 (with some editing) episode 13, Episode 11 would be 10, 12 would be 11, and 13 would be 12. : /