I agree that the torture droid removal is not perfect, but to me it is better than keeping the droid, and also it is the best I could do (for now at least).
I try to see if I can smooth things out a bit, and also maybe try some other screams. In any case, the torture droid will not be in the final edit ;)