Except it wasn't right. It works--it's a potential interpretation of the events, except for one bit in the text that counters it: the text identifies the wand that flies into the air in the very last Voldemort-Harry duel as "the Elder Wand" and from context that wand is the one which was in Voldemort's hand. If not for that it could have been valid, I think. Evidently JKR's interpretation of "The master of the Elder Wand was Draco Malfoy" was that Draco was the wand's master but he never actually took possession of it, and when Harry defeated Draco Harry became the wand's master but he didn't lay hands on it either until that final moment in the duel with Voldemort.
*yawns* I'm too tired to think of anything else except that I like my first version better.