That would make it better. Only that is not the impression I got from the movie: K2 clearly didn't have an obedience clause anymore, but the way I interpreted it was that he was reprogrammed to be loyal to the Rebellion. I don't think anything in the movie says otherwise, but it's not directly addressed either. The previous movies gave us examples of droids being loyal to people even beyond their programming, and K2 and Cassian could be something like that, but nothing we've seen of imperial droids so far gave the impression that they are capable of complex moral reasoning, and it is unsure why they would be created that way since we never see them being used that way by the Empire. (Also not fun: imagining all imperial droids as essentially brainwashed victims.) It's a nice headcanon for this particular case, but doesn't affect my overall unease with the treatment of droids in Star Wars.