I so understand wanting to be sure he knew what you were thinking and I do think its important.
In my opinion the 2 months clean though is a scared repreive and not permannent if hes not working on his issues.
Also In my experience for me, its all or nothing and Im not so good at holding boundaries when constantly tested.
you gotta do what you feel is right