Contextually in it's current placing Yoda's death scene feels like it happens almost as soon as Luke lands.

It feels like he has just parked the car, gone over to Yoda's place started talking to Yoda, noticed he has a bit of a cough, helps tuck Yoda into bed, Yoda says he will soon die, he starts to die and Luke squeezes the truth out of him with his dying breath.

It has all the build up of Morticia Addams pregnancy in Addams Family Values.

If it's moved to nearer the front Luke could have been there for about a year training and polishing his skills.

Luke has noticed he isn't well but hasn't said anything.

Yoda knows he is dying and starts to say goodbye.

Luke manages to get an answer to that nagging question he has been deferentially dancing around since he came back.

It just makes more sense.

It's not over thinking, it's just thinking.

It might make for a cool fraction of a second not knowing for sure who the dark hooded figure is coming into the palace but the effect of keeping the current order is to cheapen Yoda as a disposable character, who can pass on all a young man needs to be a Jedi in a really quick crash course before getting out of the way.