)
Id say even then having his character go about it the wrong way is a interesting storyline, while i feel he adequately did enough to be forgiven by putting himself in danger to free the heroes and staying behind to help hold off the baddies without any powers.
But
I do think they should have had him immediately broken when he lose his magic like in s4 and should have had him go even more above and beyond on screen to make up, like have him offering not to have his magic again but them giving it to him because they feel he is a far better being than he was before.