If you are using that clamp on cable stop, another way to prevent cables rubbing on the head tube, is to have the two cables cross each other just behind the head tube, but before they go into the cable stops.
Obviously you would have to mount the clamp with the cable stops on top.