Jaime killing the Night King should have been the only right answer. It makes the whole trip beyond the wall to get evidence worth it instead of being for nothing, and it completes the greatest redemption arc in television history.