Yeah, it’s one of those things I think where canon should be determined by cultural weight. We recognise Hayden’s Anakin more than Shaw, so despite the questions it raises, I’d always advocate for Hayden.
The tricky one is Padmé’s death. I can’t determine which has the strongest weight in the cultural hivemind - “I remember my mother” versus her dying onscreen in childbirth.