Yeah I have the same issue.
yes, had to battle him to complete the affinity. Byt it was only like 5 battles.