Maybe this could work?

Everyone is returning to Hogwarts for their final year. Most have to repeat, but Ginny challenged her exams over the summer, and is now in her seventh year with the rest. Including Draco Malfoy. But he doesn't seem to be the same person he had been, at least not how she was brought up to believe he was