Deduping between Individuals and Organisations
You can change a contact's type either by the API or (safer) using the contact-editor extension.  Obviously once you fix the types the dedupe rules will work better for you - but I don't know of an easy way to search for dupes across types.