Or even better, replace Shaw and RotS Christiansen in RotJ with an aged up Christiansen. Shaw looks and sounds nothing like Anakin at all and should be removed from every version of the films, including the unmasking and especially in RoS:A.
I’ve always thought this was the right answer.