I agree that they planned for Shaw's return and there was never actually doubt in my mind. But I think they should have left it ambiguous - we the viewers would have expected a return anyway (with only a hint of uncertainty) but we would've been on the same page as the characters and the eventual return would've had a…