Honestly, he did the best that he could under the circumstances.
It's not his fault if Octavia chooses another path for herself.
With Madi though, given his fondness of kids in general and the fact that she's important to Clarke (who is important to him), I do think that he will ultimately bond with her - with or without the Octavia "reminder".