The way I’ve always preferred the “Look sir, droids!” scene is the way it was shown in the Theatrical version, but with only one CGI dewback in the background.
But if they don’t hold up enough to be used for the HD version then so be it.
He is going keep the CG dewbacks parked outside the Cantina, from what I remember.