Dude, you are extremely optimistic. I am fearing that they will instead chop off and summarize stuff out of the original game.
FF games usually have some good end game content, large optional bosses, collectibles, side story stuff but all left for 'end game' given the name. Considering the 'end game' won't happen until 2036 they'll have to add a lot to part 1. They'll add loads of substance to Midgar we don't really need...
... while half arsing the Honey Bee Inn scenes. :P