I think that the number one problem is the late recruitment with this strange in-between where he squats our camp without being able to join the group.
The quest in the Plan of the Shadow should not be the time to be recruited but his main quest, I think he should join the group after the Grove Arch.
