As someone who genuinely disliked the sad plot twist in this song as a child (and still sort of does as an adult), I think the best way to give this song a happy ending is just to not sing the last two verses. I myself would have actually preferred that the song stop in the middle (or tell of more things that Puff and Jackie could have done together).