Before you go into explanation, please read all of this.
The elder wand in malfoy's posession.
Okay, so Malfoy became the true master of the wand by taking it by force from dumbledore at the end of book 6. Then Harry became the master by disarming Malfoy at his house. If this is the case, then the master does not need to use/have the elder wand to lose posession of it, as the wand was with dumbledore when malfoy was disarmed.
If this is the case (which it must be) then Harry not using the wand will have no effect on passing ownership of it. If someone takes his phoenix wand from him by force, he will lose ownership of the elder wand no matter where it is. So it will NOT die with him in this case, it won't die at all. It will just be hidden.
Also... what is with that baby in harry's Dumbledore "dream"?