In the end, Chapter Four won. orz It was driving me crazy trying to fit everything all together when the stuff kept changing, so I said "You know what? This is a first draft. First drafts are...first for a reason. I'm sure the readers would rather have something to read than for everything to be abso-bloody-lutely perfect, so, put everything back together, split it up again, and post!" And so here we are, with chapter four, part one UP! Woo!!!
(Another example of this fic having its way, despite the fact that I'm the author here. My life, what is it.)