I'd be very hesitant to make big concessions on what you need to feel happy/comfortable on this trip. He'd be learning he can indeed wear down your boundaries to get things his way.