I've been looking through a lot of questions on this website and I'm still not satisfied with my understand of Dumbledore's plan for the Elder Wand. As far as I can tell, these are the facts:
Dumbledore intended for Snape to end up with the Elder Wand (Deathly Hallows, chapter 35):
"If you planned your death with Snape, you meant him to end up with the Elder Wand, didn't you?"
"I admit that was my intention," said Dumbledore, "but it did not work as I intended, did it?"
"No," said Harry. "That bit didn't work out."
Dumbledore intended to die as the last master of the Elder Wand (Deathly Hallows, chapter 36). This does not contradict the previous point:
"Aren't you listening? Snape never beat Dumbledore! Dumbledore's death was planned between them! Dumbledore intended to die, undefeated, the wand's last true master! If all had gone as planned, the wand's power would have died with him, because it had never been won from him!"
Dumbledore expected Voldemort to obtain the Elder Wand (Deathly Hallows, chapter 35):
"But you expected him to go after the wand?"
"I have been sure that he would try, ever since your wand beat Voldemort’s in the graveyard of Little Hangleton."
Dumbledore did not intend for Snape to die. This point is the hardest to prove. The best evidence is that it goes against what we would expect of Dumbledore, but we also have the point that he was expected to live long enough to pass vital info on to Harry (Deathly Hallows, chapter 33):
"If there comes a time when Lord Voldemort stops sending that snake forth to do his bidding, but keeps it safe beside him, under magical protection, then, I think, it will be safe to tell Harry."
Putting this together, it appears that Dumbledore wanted Voldemort to get the Elder Wand from Snape, without killing Snape, and without Voldemort realising that he wasn't its master. Is this both an accurate and complete representation of Dumbledore's plan for the wand? It seems like I've done too much work to figure out what ought to be a key plot point, and frankly, it seems like a weak plan.