I've been in the same situation es and I handled it poorly. If I could go back, I would simply 1) Be myself at all times and not give into the 'bend over backwards to please other's response. 2) Speak up for myself, respectfully question them when they make off the wall remarks rather than ignore them, try to understand then be understood (Steve Covey) This will earn respect from these types of people when they realize they can't put you down to your face and get away with it.
The reason I would do this is because it would make things easier on both me and my partner. He wouldn't have to get in the middle or choose sides and I could walk into any situation knowing I could handle myself.
((((((((((((((((((( es )))))))))))))))))))))
tam