Nice job. Keep on defining your boundaries and demanding RESPECT from both parties and you should see a change in the dynamic. Like Sandi said this dynamic has been very immature and needs to change or it will just continue.

Hold the line.