Wasn’t there an edit that moved the Obi-Wan convo to Endor before Luke turns himself in? I remember that working really well as the environments are similar and it narratively makes more sense for it to be there.
Not that I’m in favor of reordering at all, but the obi wan and dagobah scenes aren’t exactly a linked package; it’s been done well before.