[Emma | Angel]
Sort of. The idea would be to alter the spell so that it still grants the soul but removes part of the curse. In a sense, the curse has two parts. One is the soul itself, but the second involves the lack of true happiness. If there's a moment of true happiness, the soul disappears. It's the true happiness clause that needs to be removed.