I have gradually shifted all the pieces of the ms around so that like pieces are together, and the major sections are in order. Ex. all the stuff about beating up the guy is together now; all the backstory is in one area; the huge breakup scene and its aftermath; the night attack; the trip to the walled compound. Also, the not-plotty stuff like the hair-braiding scenelets (don't ask), and the stories the characters tell each other, and the secondary characters' backstories & freewritings, each now have their own little areas of the ms.

So what I've got now is the entire story laid out in a basic shape (a very patchy basic shape), and the non-plotty stuff will gradually be worked in around the action so as not to make the pacing sag too much. That's the ideal, anyway.