Could the covalency issue be solved via adding dipoles for the bond overlap electron density, in addition to the functional group dipoles?
Large covalency should correspond to significant interatomic (bond) density.