While many of us have been through similar situations, we are not lawyers. (Well, some of us might be, but you understand my point). These are questions you need to discuss with your lawyer. He has a strategy, I'm sure, of how he is handling your case and you need to see eye to eye with him. That way you are totally prepared to go to court.
I hear you still wishing to control your AH by setting forth terms for his recovery. Likely he will not agree to it and even if he does, it's a near guarentee it will be all BS anyway.
So sync up with your lawyer and take his advice. He clearly knows what he is doing. And as has always been said, document everything you can. Take better pictures or get your lawyers to come over and do it. However, I would say keeping drug paraphanalia in your house is a really bad idea, especially if cps shows up.