I admit, the "re-souling is a happy ending" trope drives me a little nuts, too. (Not that it's kind of obvious with this story...)

But, yeah, the only one where you could argue where re-souling was a "happy ending" was the third time Angel got resouled in S4 Angel. The first time was traumatic, the second time he got it back just before spending a few hundred years in hell.

So, yeah, not so much a happy ending as it is an ambiguous one.