I prefer to have Shaw for that very reason. I think it gives a more potent representation of redemption to have that very man welcomed back into the good side of the Force, flaws and all. I think it diminishes the impact by only welcoming the young man that he was 25-ish years ago. That person didn't need redeeming.