My head says Shaw, my heart says Hayden. I was a prequel kid and grew up with the 2004 DVDs. I honestly teared up a little bit the first time I saw Hayden in ROTJ because it felt like a full circle moment.
But, ultimately, the films are more effective when watching in release order, and in that case, Shaw makes more sense.