I like it. In fact, I may have to concede it makes more sense than my “restructuring” idea.
About “the question”, I think the script hints that Yoda has been dodging the question, which to me can be used as evidence that Luke had tried to get an answer out of him before.Yoda: One thing remains… Vader. You must confront Vader. Then, only then, a Jedi will you be. And confront him you will.
Luke: Master Yoda…is Darth Vader my father?
Yoda: Rest I need. Yes. Rest.
Luke: Yoda, I must know.
Yoda: (reluctantly) Your father he is.It does lend to itself that Yoda has been dodging the question over some time … not until he was about to die he finally would admit it.
Luke: Yoda, is Darth Vader my father?!
Yoda: After more training, tell you I will
…
Luke: Ok, is he my father?!
Yoda: A nap, I take first.
…
Luke: Now will you tell me?
Yoda: Into the cave you must go, answers you will find.… and so on.
It’s also supported in the deleted scene where Yoda tells Luke that he’s deliberately been hiding the secret from him as long as possible. To me it makes perfect sense that it would be limited to a deathbed confession.