As your situation evolves, documentation is everything. Rely only on what is in writing, communicate from now on by mail or (saved) emails, and develop a paper trail.
You cannot unilaterally alter existing contracts and laws, such as trying to get your security deposit back before the 3-week maximum called for by CA law.
You can put every complaint or proposal in writing and ask that they reply in kind. The very fact that they know you are savvy and documenting everything will help keep them honest.
You should immediately reread carefully your existing contract and any related papers so you are fully informed of your current rights and obligations.
