I know the choir thing is anime original, but since Yoshiki was carrying the knife with him the entire day, could he have chickened out in killing Hikaru when they were outside, but seeing the school choir reminded him of needing to keep the others safe from Hikaru? I mean, what was he planning on doing with Hikaru's corpse in his room?