Well the author has said that he is following the book timeline instead so maybe those episodes will crop up later instead? Then again Shirou isn't as innocent as Saito so maybe the situations will be defused too easily.
_________________________________
Take Your Candle, Go Light Your World.
_________________________________
Take Your Candle, Go Light Your World.