You are correct on most your points.
In a greatest time episode ever, Times Arrow (Star Trek : TNG), is where I got the idea. Guinen was alive back in Samuel Clemens time to see some of the crew of TNG. Even though they came back and alterned time, she remembered them coming back and...