It does end at the same spot, yes.
Thanks for letting us know. We'll look into correcting the issue for launch.
The expansion's release will likely be between 1 and 3 months post-launch of the base game. One of the routes for it is already completely written, and the art assets have been worked on simultaneously for consistency.
We're glad you're excited to play the game! A lot of blood, sweat, and tears have gone into it.