I watched a few GOUT Death Star scenes from this set again. When you pay close attention to them, they're going to distract you, especially when cutting to and from cockpits, DS interior, and Yavin interior. But if you're just watching uncritically - ya know, like normal people - I don't think you can expect a better job than this without using a better 720p GOUT source than the one's you've got, and I don't think that exists.
So whether you go with this or straight upscale really depends on how much you're distracted/you let yourself be distracted by the GOUT stuff in here. Personally I don't think the tradeoff with a straight GOUT upscale where quality bumps - even with EditDroid, which is sharper, not distractingly 'jerky' - don't really happen is a very good one in comparison with this magnificence: EditDroid is dark. It's difficult to see anything in the cantina scene or inside the homestead sometimes in comparison to Harmy. The starfield at the beginning goes in and out, and opening crawl and scenes are not terribly sharp overall (horrible jerkiness in initial int shot of Tantive IV with 3PO and R2 - all GOUT upscales are like this). So again, this depends on preference, but frankly for most people, this should be the go-to set (among those that I've seen but I frankly doubt that'll change) unless you're in love with the credits or can't help but be extremely distracted/annoyed by the GOUT sourced Mos Eisley and DS scenes.
We've come a long way from ocpmovie (definitely my least favorite, although you gotta give him some credit for the idea)