After watching the additional scenes I'm leaning more towards us going to the first. The hints seems to point to more than just time travel. How can Thancred use magical bullets? Why do Yoshida point out how Y'shtola is not exactly a black mage? We already know the scions are never purely one job at why make this destinction with her? Then I started thinking about the WOD scene and remembered their jobs are different than ours. Maybe things seem close but not exactly the same. Plus Minfilla is back so that means the WOD storyline is coming back to focus. Everyone was called before us so maybe the scenes we are seeing are happening on the first prior to our arrival and that is why the forest is burnt before we arrive.