I'm pretty sure more than half of his motivation is to murder Rin just like her mother. The dude is evil. Rediscovering fatherhood doesn't change that.
I don't like how inept Manji is. He is getting beat down all the time, this time by a dude with no weapon...