Everyone returns to wholeness in the end. This is why nothing you do in this life really 'matters'. Enjoy, have fun, play the game, but at the end, you will return to your full state, it's unavoidable because you are inherently what is true, pure and whole. There is no need to worry about the soul trap because you are inherently "god", you are the one, you are "it", there is no separation because you are "it". I don't even like the term "one with god" because that is implying there is separation between the two.