I did a similar thing after upgrading yesterday. Going in and changing the names of my phone contacts (i.e. adding last names or replacing nicknames with real names) seemed to help it link up a lot better! It's still not perfect, and not being able to link manually is a bit frustrating for sure...