Yep! Forgot to mention that but they did basically say that about him on the audio commentary. They were SO thankful he worked out.
But I am definitely convinced that anything from S1 wouldn’t have conflicted with whichever way they went with things. They made a plausible backup option in a season when they didn’t know if they’d get him by the end or not. But the show was never always about SF. They’re pieces of the puzzle and an important section of it. But nothing has gone against that.