if things escalate at all, you may want to consider a restraining order. if for nothing else than to get the point across that you dont want him around you. keep in mind this isnt something to do for shits and giggles, but im sure you are intelligent and know this. just know that is IS an option if he does threaten your, explicity or implicity.

One own the air, one pay to breathe.
- NOFX