I don't know if you should give up. I think you need some support if you're going to see and spend time with him when he gets back. It sounds like the situation is volatile and tense and made worse by your isolation.