The Two Deaths in Mystical Christianity

I think that Christianity may have conflated Jesus's mystical experience of an ego death, perhaps at the time of his baptism when the "heavens opened," in which his individual psychological self "died" and he was was "reborn" of Spirit, or "raised up" (resurrected) to his identity in Christ consciousness (a consciousness of nondual union in God/Reality), with his biological death on the cross. These two deaths seem to have been conflated at some point, resulting in a supernatural conception of the resurrection.