I think they're trying that, and it worked for s1 (they were basically spot on), but imo in s2 they were too liberal with changing the arcs and timeline for my little book purist mind to be okay with, and I feel like in this series where so much shit happens once you start changing things you can never get that full sense of order back??
but to answer your question quickly: generally yes
but to answer your question quickly: generally yes