The blue R2 from the SE actually does look better, since they didn't tremendously oversaturate him as they often did in Empire, so keeping it in wouldn't really bother me, but as long as you're going to the effort of making a theatrical reconstruction, it might as well be reverted.
Those shots in the clip look impressively good.