There is no canonical order. You can put either of them first or last and you wouldn't be wrong. Most theorists prefer to put OoS first, as that is what happens in the manga (and maybe a few other details), but you could put OoA first in a timeline and it absolutely wouldn't matter. Both are correct.

__________________