So, on one hand I took a step backwards on the word count. On the other, I'm much happier with the direction the story is taking. Overall, it's a win. It just greatly slowed my progress towards the end of the story. Oh well. Better to fix the problem now than to wait until I've finished the story and then have to go back and fix a lot of chapters.