Apologies if you already answered this but are you planning on having Naruto promoted before he becomes Hokage. It's just something that bugs me in the series that Naruto routinely fights S-Class enemies, including Pain who curb-stomped the entire village, and is still a genin.
Author's response
Without giving too much away let me just say that if Naruto is going to be raised up in rank it will be via the only shown method in the Anime and Manga. But at the moment it might not be something he wants as there are certain advantages to being a genin that disappear if he is promoted. I think a scene I have planned for the Guren chapter and Samui's will show this a little better.