I know that this could just get chalked up to Rule #1 (the Doctor lies), or I guess it could be a plot hole, or I could be confused, but in TWoRS, Winston asks the Doctor why he invited Rory, Amy and River to the lake. He said that while he had to die, he didn't have to die alone. I see no reason for the Doctor to lie at this point. But, if he was in the "Doctor Suit" the whole time, he wouldn't have felt like he was going to his death, so no reason to be sad.

So, was there an "original" timeline where the doctor actually dies? But, because Amy saw it, which then she accidentally revealed to him when she thought she was talking to a ganger, which then gives the doctor time to prepare the Tesselecta suit? Or am I missing something more fundamental? Thoughts?