Yes, definitely fix 2 if you can. I wouldn't work from the sprite though. Just work from the original and make a palette that works better.