Automatically associate Contacts with Companies based on Company Name property

The automatic association really makes no sense at all and makes importing contacts almost impossible. Adding them manually is the faster and safer way up to a number of at least 50 or so. We are a b2b business and we almost always have different offices of the same company in our system, so location Berlin, location Stockholm, location Paris, etc. They all have the same domain - so when we import contacts, it almost always creates a mess.