Yes, but like so many attempts to fix a small issue, you have overdone it. Your corrections are far to yellow.
And as for R2 - are you aware of how many of them were made and that they had to make new ones for each film? They were able to improve them greatly for TESB. So it isn’t a matter of repainting the old ones (they didn’t), it is making new ones for each film. For the first film the blue was more purple. For the rest it was more of the dark cobalt. So removing the purple hue from R2 is a mistake.
And since you mention Raiders… how about these…