This reminds me of a popular movie of perhaps 30 or so years ago, titled “Heaven can wait”. It was about a football player who died prematurely and was allowed to body hop until he finally found the right one, another ball player who died on the field, and the hero immediately moved in. His female friend from the first life recognized him - happy ending.