Congratulations on the progress thus far. I like your approach of revisiting the introduction after fleshing out the substantive portions. It's how I've had to approach most of my major papers in the past. It keeps me less limited in how I explain and elaborate throughout the paper.