Another ROTJ taste variation.
What if we don't see Yoda die?
Luke has his conversation with Yoda who isn't very well.
He tells Luke Vader is his father and Luke says sorry for running off.
Luke leaves Yoda alive but unwell.
At the end of the film we see him as a Force ghost so we find out he died later.
It might make his death seem less abrupt and midcoversational.