Just to throw something else random into the mix....if he's fussing around when feeding, could reflux (even silent reflux) be an issue?

As for the wanting to go to sleep kind of on his own, that's ok too. DD2 was especially like this for me. In some ways it made my life easier as I could just pop her in bed and head straight back out to DD1