well, i just watched episode 5.

so the first 3 episodes were ova 1, then 4 and 5 are ova 2, and it seems like, unless they really stretch it, about half of ova 6 is going to be the end of ova 2. so after that we should be seeing the new story parts.