Went through 15-19 a few times, and I think it was more of a justification that "Archer is never supposed to be together with Rin, so don't worry about it too much", which makes sense, since if Rin were by Shirou's side the whole time, he shouldn't become Archer in the first place (this Archer...