I hope they properly budgeted all the fights, because if they all look as good (if not better) as the Archer vs Lancer, UBW will be Anime of the Season.
Episodes 2 and 3 have been confirmed to have some Nasu original scenes, reportedly. I think they mean the actual episodes labeled 2 and 3, so it won't be in next week's episode.
Tokiomi's plan for Gil going rogue was summoning another Gil to have them kill each other. Sadly, he never planned for the Kotomine appreciation pat on the back.
More likely it was simply: Oh, I have this awesome servant. Better make sure my descendants can get just as awesome a servant for themselves when it's their turn to fight. Either that, or Tokiomi is just a hoarder and never threw it out.