I prefer Shaw because I usually watch the saga in Release Order, so at the end of RotJ, you the viewer haven’t seen Hayden yet, and a first-time viewer would be confused about who he is.
Also, Shaw looks more like a proud father. Hayden looks…off. George really should have shot some proper footage of Hayden for that moment, if he was so intent on changing it.