This definitely makes more sense. It's the future version who dies, not the past version. I think I got into my head that Time Remnant = past self because of what they did with the Reverse-Flash. That was the first time the Time Remnant idea came up, and it was a past version, so I guess I just assumed that the remnant who dies is always the past version.

It's still the ultimate cheat, though, as time travel always is. Hopefully Barry realizes that time travel should only be used in the most dire of situations.