Just so you know... 2

[Tostada]

I think you should settle up with your X. Then, if you don't like how things are going, use 'leaving' perhaps as some leverage for more of what you want/need from him. Sounds like a hassle for him which equals value for you.