Im sure he will have redemption, but not a focused training arc and certainly not redemption against Shanks.
When we go to Elbaf, and if hes there and alive, I can see him respecting and allying with Luffy by the end. He did, after all, help defeat Elbaf's grudge against BM.
Then, i can see him facing an Admiral or a Gorosei in the endgame. Same idea with Law. But Shanks and BB are off limits at this point.