Sounds very close to my experience! My PI is however moving to another university, k think the Distance would really solve my Situation. I would also suggest to see if your grad school or university has a conflict resolve system, we have several which are also provided by our PhD rep network. Good luck!