As far as "holding water" I think your comments do a good job explaining your perspective and that it's a reasonable one. I do think my inherent dislike for the reincarnation element is pushing me towards viewing it as replaceable instead of a compelling element. I still want to say the story could be done without the reincarnation element, but it's easier to say that than it is to have to write out a full story that's still compelling.