Yes, that's it with Hange, the diary thing is my fault, forgot to update it.
As for Instructor. That last scene depends on the choice you made with the Instructor.
If you chose to go down on her during your first time with her, then it's love route and vanilla sex.
If you decided not to and blackmail her instead, there'll be another sex scene.