Stuck Migration 2007 -> 2013

Hello,

I need assistance with configuring our environment for co-existence.  I am following the following steps without any luck: http://www.msexchange.org/articles-tutorials/exchange-server-2013/migration-deployment/planning-and-migrating-small-organization-exchange-2007-2013-part13.html

Our Environment: 

Exchange 2007 AD Computer Name: mail.xbb.local
DNS Entry: mail.xbb.local  10.0.1.2  (only DNS entry - no additional DNS entries for autodiscover)
(all internal)
AutoDiscover URI: https://mail.xbb.local/AutoDiscover/AutoDiscover.xml
OWA: https://mail.xbb.local/OWA
OAB: https://mail.xbb.local/OAB
EWS: https://mail.xbb.local/EWS/Exchange.asmx
Active-Sync Internal: https://mail.xbb.local/Microsoft-Server-ActiveSync
Active-Sync External: https://ll.xbb.local/Microsoft-Server-ActiveSync


Exchange 2013 AD Computer Name: exchange.xbb.local
DNS Entry: exchange.xbb.local   10.0.1.3

Steps taken:

Created Certificate on Exchange 2013 server for 2013-2007 server co-existence

change AutoDiscover SCP on Exchange 2013 to https://mail.xbb.local/AutoDiscover/AutoDiscover.xml

Changed all URL's on Exchange 2013 to match 2007:

OWA: https://mail.xbb.local/OWA
OAB: https://mail.xbb.local/OAB
EWS: https://mail.xbb.local/EWS/Exchange.asmx
Active-Sync Internal: https://mail.xbb.local/Microsoft-Server-ActiveSync
Active-Sync External: https://ll.xbb.local/Microsoft-Server-ActiveSync

After changing URL's, I enabled co-existence certificate on 2007.

Created Legacy DNS entry: legacy.xbb.local   10.0.1.2

Changed URLs: 

OWA: https://legacy.xbb.local/OWA
OAB: https://legacy.xbb.local/OAB
EWS: https://legacy,xbb.local/EWS/Exchange.asmx
Active-Sync Internal: https://legacy.xbb.local/Microsoft-Server-ActiveSync

Changed MAIL DNS Entry to 10.0.1.3  (only 1 DNS entry - used for AutoDiscover and Exchange 2007 Server AD name!)

Added legacy.xbb.local as 10.0.1.2 (same IP shared as Exchange 2007 AD Computer Name - Mail)

I am running into issues with connecting to 2007 mailboxes after making this change.  

What do I need to do differently since the same mail.xbb.local is shared as the Exchange 2007 Computer name and AutoDiscover?

Any help will be appreciated.

Thank you,