In every form of the Fan-O-Matic style reworking Luke is on Dagobah at the beginning of the story (his first scene is the death of Yoda) what order the scenes play out in is a matter of experimentation.
It appears I might be getting my (long mythical) new computer this week so ASAP I will try different combinations.
My instincts point to the Vader scene coming after Yoda confirms who he is as it serves as a reminder of the end of ESB but it may work out differently in the wash.
The most important aspect of the story is the Emperor/Vader thing but it doesn't hurt to remind the viewers, save Han and then go back to it.
Aunt Beru, the Sand people etc have nothing to do with the Death Star but they fill in a story where the Death Star has already been flagged up in the beginning.
The Wampa, Han's tiffs with Leia etc have nothing to do with Vader tracking down Luke but they don't get in the way of a story where that was flagged up in the beginning.
Also I suggested a few ways where the Jabba scenes could be tied into the main story (Vader having the planet watched to see if anyone attempts to save Solo, Fett selling the plans to the Rebels, Fett tipping Vader off that the Rebels are in the Palace etc).
The key advantage with starting Luke's end of the story on Dagobah is he is a fully trained Jedi (all be it still a crash course of about a year) by the time he faces the Emperor and tries to save his friends.
In the current set up he has had about a days worth of training from Ben and a few days from Yoda (presumably everything else was done via Ouija board) and Yoda just hangs on and dies a few miniutes into Luke's return visit.