Exchange 2003/2007 public folder replication issues for one folder

Recently brought up an Exchange 2007 server to migrate away from Exchange 2003.  We have about a dozen public folders, all came over fine except one - the most important.  It has about 2000 contact items in it, and the total size is about 3 megs.

Only about 1675 items made it over, and we followed the troubleshooting steps here as closely as possible, but it's tough as this was written before 2007 - http://msexchangeteam.com/archive/2006/01/17/417611.aspx

Anyway, it appears it's a backfill issue as new items appear to sync.  It's just the initial sync that's causing problems.  We turned up diagnositc logging on the 2003 box and receive the following -

Event Type:      Information
Event Source:      MSExchangeIS Public Store
Event Category:      Replication AD Updates
Event ID:      3011
Date:            10/16/2008
Time:            10:21:22 AM
User:            N/A
Computer:      EXCH001
Description:
A replica of public folder (1-7567) IPM_SUBTREE\Public Contacts
 was modified.

 Expiration interval: 0 (0)
 Database "First Storage Group\Public Folder Store (EXCH001)".
 Folder-wide expiration interval: 0 (0)
 Schedule: 2 (2) FF FF FF FF FF FF FF FF FF FF FF FF
FF FF FF FF FF FF FF FF FF FF FF FF
FF FF FF FF FF FF FF FF FF FF FF FF
FF FF FF FF FF FF FF FF FF FF FF FF
FF FF FF FF FF FF FF FF FF FF FF FF
FF FF FF FF FF FF FF FF FF FF FF FF
FF FF FF FF FF FF FF FF FF FF FF FF
 (00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00
)
 Priority: 0 (0)
 Owning information stores added: {0}
 Owning information stores removed:  

For more information, click http://www.microsoft.com/contentredirect.asp.


Event Type:      Information
Event Source:      MSExchangeIS Public Store
Event Category:      Replication Outgoing Messages
Event ID:      3018
Date:            10/16/2008
Time:            10:21:31 AM
User:            N/A
Computer:      EXCH001
Description:
An outgoing replication message was issued.

Type: 0x2
 Message ID: <90BBDBCB14F25144A84BDA3D21E2D3D403BE53@exch001.domain.com>
 Database "First Storage Group\Public Folder Store (EXCH001)"
 CN min: 1-3B1B0, CN max: 1-3BE51
 RFIs: 1
 1) FID: 1-7567, PFID: 1-7559, Offset: 28
      IPM_SUBTREE\Public Contacts

 IDCN Deleted:
 {0}
 

For more information, click http://www.microsoft.com/contentredirect.asp.

Event Type:      Information
Event Source:      MSExchangeIS Public Store
Event Category:      Replication Outgoing Messages
Event ID:      3020
Date:            10/16/2008
Time:            10:21:31 AM
User:            N/A
Computer:      EXCH001
Description:
An outgoing replication message was issued.

Type: 0x4
 Message ID: <90BBDBCB14F25144A84BDA3D21E2D3D403BE56@exch001.domain.com>
 Folder: (1-7567) IPM_SUBTREE\Public Contacts

 Database "First Storage Group\Public Folder Store (EXCH001)". CN min: 1-2E861, CN max: 1-2E865
 Message IDs: 1
  1: 1-A841, 1-2E865
--- : Pat Test : 10/16/2008 1:54:42 PM

 MIDSET Deleted:  {0}
 

For more information, click http://www.microsoft.com/contentredirect.asp.


Event Type:      Information
Event Source:      MSExchangeIS Public Store
Event Category:      Replication Outgoing Messages
Event ID:      3017
Date:            10/16/2008
Time:            10:21:33 AM
User:            N/A
Computer:      EXCH001
Description:
Outgoing message type 0x10
 Message ID: <90BBDBCB14F25144A84BDA3D21E2D3D403BE5A@exch001.domain.com>
 Folder(s): (1-7567) IPM_SUBTREE\Public Contacts

 Database "First Storage Group\Public Folder Store (EXCH001)".

For more information, click http://www.microsoft.com/contentredirect.asp.


Event Type:      Information
Event Source:      MSExchangeIS Public Store
Event Category:      Replication Incoming Messages
Event ID:      3027
Date:            10/16/2008
Time:            10:21:33 AM
User:            N/A
Computer:      EXCH001
Description:
An incoming replication message was processed.

 Type: 0x20
 Message ID: <6C209CD297926B4D87B0FCDF0D53FF29050F60F3@EXCH002.domain.com>
 Database "First Storage Group\Public Folder Store (EXCH001)".
 Folder(s): (1-7567) IPM_SUBTREE\Public Contacts

 Server: /o=Org/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Configuration/cn=Servers/cn=EXCH002/cn=Microsoft Public MDB

For more information, click http://www.microsoft.com/contentredirect.asp.


Event Type:      Information
Event Source:      MSExchangeIS Public Store
Event Category:      Replication Conflicts
Event ID:      3066
Date:            10/16/2008
Time:            10:29:49 AM
User:            N/A
Computer:      EXCH001
Description:
A folder design conflict occurred in public folder (1-7567) IPM_SUBTREE\Public Contacts
 located on database "First Storage Group\Public Folder Store (EXCH001)".
 Users involved in the conflict:
A2E
User1

 Conflict CNs: 1-3BE5C
8-50F6CFC
 

For more information, click http://www.microsoft.com/contentredirect.asp.


The rest of the messages are similar to above, mostly 3021s.  The conflict above is what's making me wonder - we use a utility called Add2Exchange - it syncs (One way, public to private) all of the public contacts to each user's private contacts for Blackberry usage.

I tried to resend changes and sync content (Under status in ESM), no help.  Finally removed the public folder and let everything settle, then readded the replica - same exact thing, same exact number of items sync'ed.  

Ideas?