Hey James,
We’ve had this super annoying problem as well for so long…
So we decided to build a simple app to solve it. We call it 
Hubspot Property Mapper 
In just a few seconds you can enable syncing between any combination of Hubspot properties (Contacts, Companies, Deals, even all 3).
The app is currently in limited beta → you can sign up here: https://wunderhubhq.com
Here’s how the app looks like 
Let me know if you have any questions - happy to answer!
Might be interesting for you as well: @Leonardo @Tiina @alyssacarter @annay @Maxwell @Finnspin @ivorykeys87 @BernardoV @cfleishman @hansenhunt