I thought the Elder Wand business was one of the few things that did work out neatly, myself.
Since DH I have seen a number of fanfiction stories that deal with Harry returning Draco's wand to him, as if it were just a kindness or a gesture, which has left me puzzled and wondering if these writers have missed something in DH. Draco's wand is the Elder Wand, which Harry says he will put away and not use, anticipating that if he dies a natural death the wand's power will be broken. Harry can't return Draco's wand to him without addressing that that wand is the Elder Wand. Am I the one who's confused?