OP here.
An update on that topic: We started the conversation that is leading down that road yesterday. Neither of us are happy and we both feel stuck. I get the feeling it'll be over sometime this week with no harm done. Just kind of worked out that way I guess.
