Ah! A fellow holder of the belief that time travel stories are better when they are internally consistent! I hate e.g. Looper for having time travel that makes no goddamn sense. It takes me out of the story when the characters are literally watching the timeline change before them as it magically radiates out from one point. And then our protagonists somehow remember the original timeline... Bah.

...So I must ask - have you seen Primer? If not, maybe you'd like it!