That's more or less what I assumed. A more radical edit might make the time difference more explicit — the Bespin scenes and the Dagobah scenes are intercut in the original and ESB:R, whereas a time-stretching edit would place the Bespin scenes after most of Dagobah.
The only problem with this is that the Han/Leia romantic subplot plays out like they were only on the Falcon for a few days. You could justify this in a harder piece of SF by citing relativistic effects — they take a few months to get to Bespin, giving Luke the requisite time to train, but they only perceive a few days — but in something like Star Wars it comes across as handwaving.