Oh, that is so good to hear -- that the communication line is open! Even if it has to wait a bit, it should help some knowing that. Maybe during the interim, you could think about how you'd like to approach it. Think about what is at the root of things. It's so easy to get caught going in circles over details.
Something BF and I have found helpful when there's friction/misunderstanding (he's got more a BPD thing going on) is to agree that only one person will talk at a time. One person will get to raise a concern, and the other one listens --
no interruptions (And hell yeah that can be hard!! Lol!) With listening turn, try to REALLY listen and see it from their point of view.
Then switch. Also, try to avoid words like "always" and "never" and try to use "I" statements (those 2 things right there automatically preclude the ol', "You NEVER blah blah blah!!"

Basically, letting both people be heard and trying to not set each other on the defensive. Oh! And not aiming to "win". Try to keep a team attitude. The goal is to make it work -- team up to find a solution or come to a better understanding-- and that's going to take give and take from each party.
It's not necessarily easy, but DAMN, it works(!) We've found the majority of the problems are misunderstandings. Assigning inaccurate motive is a biggie too.
I think you guys can get it sorted out. I really do.