As much as option 2 is a little overly-sappy for my tastes, I want that so bad. In context, it would totally manipulate me emotionally and I could see that the foreshadowing could lead that direction. Anything that gets us not!dead Ianto is alright by me. Even voluntary Retcon to keep hope alive.