He seems more preoccupied with serving Dani than with any kind of atonement. Yeah, in his eyes, the two are probably one in the same, but it always comes across as "Dani Dani Dani" being his first priority, with atonement being a very distant second, if he even seems concerned with it at all.
That said, your interpretation of the character may have indeed been what Martin meant, but to me it just came across as him replaying his old behavior, only this time he happens to be smitten with someone who isn't a shallow gold digger, so he doesn't have to act nearly as bad.
But, I admit I could be letting my dislike color my perception of the character. I guess we'll see where the story takes him.
Hopefully, to an unmarked grave in a latrine