Your movements are all in accordance with my assumptions.
On another note, Naoto's close range game has somewhat improved, especially with her new Blight move and a few other changes.
Afterwards, the protagonist will be given a choice of whether to pursue a relationship with her or remain her friend.
They suspect Mitsuru Kirijo to be doing this not only to exterminate Shadows and help people, but because there is some dark secret she is trying to hide, and they want to make it come to light.