OQ fans have been begging Adam on Twitter for an OQ dance scene b/c every other couple has had one.
If they're filming dialogue scenes in Steveston this week (and a fairly long day), that implies to me that it's more with the Dark Swan/future SB/whatever, since I doubt the crew is back from Camelot already. That makes me think even more we'll be seeing three different time periods this season: past Camelot in flashbacks, "present-day" continuation with our crew from the dagger scene, plus future/possible Dark Swan.
That would certainly be my preference! But since A&E don't remotely care about what they do destroying characters, I doubt they'd worry about it enough to write it that way. Unless they simply think a time shift would be "cool," and Emma not being destroyed is simply a happy by-product.