I'm not exactly excited about the time travel thing. I think we can square the two by saying that Whistler is explaining time lines (plural), while future Angel has only seen the one. But who knows. The whole thing makes my head hurt.