Suggestions for Supplier Master clean up after conversion from 11.5.10 to 12.1.3?

The new structure for suppliers has created a big headache. In the past a supplier had multiple sites (depending on legal entity and currency) and each site had an address. Now every supplier has one or more addresses and you link sites to an address. During the conversion Oracle gave the addresses a name that resembles a site name, and due to inconsistencies in entering address information per site in the old version (eg. "Road" vs "Rd"), Oracle treats these as different addresses.

Now we have situations where a supplier has 2 or more similar but not identical addresses, and some the sites are attached to one address and some other sites are associated to another address.