the other option open to you is a bit of the old reverse physcology but you've got to be a strong minded individual to carry it off. Give him a slight taste of his own medicine. Although you're prob burning inside you can act as though you're not bothered by anything he does and make out that it doesn't affect you at all. Believe me, he'll soon show a change of behaviour.