Your partner's company sounds like the one I left recently, for those exact reasons...