You should privately consult with a lawyer who practices in the area of landlord-tenant law. When you see him or her for the consultation, bring copies of the lease and the "separate roommate agreement" that you mentioned. Also, try to document things (i.e., dates, times, and witnesses to events in question).
If your roommate has ever physically threatened or attacked you, consider going to the police. The situation you described sounds a lot like a prelude to a domestic violence incident. Be safe.
No attorney-client relationship is established via AVVO.com. The material posted by Kyle J. Bristow, Esq., is for educational purposes for prospective clients only and people should not make legal decisions based on it. You are advised not to take, or refrain from taking, any action based on what Mr. Bristow has stated on this website.
Attorney Bristow's advice is right on. I would follow it.
-Michael R. Juarez Law Office of Juarez and Schaeffer PO Box 16216 San Diego, CA 92105 (619) 804-4327 www.jslaw.org Mike@jslaw.org This posting is provided for “information purposes” only and should not be relied upon as "legal advice." Nothing transmitted from this posting constitutes the establishment of an attorney-client relationship. Applicability of the legal principles discussed here may differ substantially in individual situations or in different jurisdictions.