I have had enough!!!!

A little background info first my husband and I have been married for 5 and a half years. Our relationship has had it's ups and downs. We also have a 19 month old son. Since our son was born we have had problems and they kept getting worse. He was never around and his anger towards me was even worse than ever. I took my son and moved out in April so that my son would be out of the house where all the arguments were going on. It was supposed to be a short-term thing, like only 6 weeks max. After I left, my husband cheated on me with our neighbor. Actual intercourse never happened, but the things that did happen was enough for me to consider it cheating. The week before he told me about his infidelity, he was diagnosed with ADHD. I have been trying to learn about what this means for us and what it could mean about how everything has taken place in our relationship. I want to move home and he tells me no. He told me some hurtful things(by text, while I was at work) basically that he doesn't want this anymore and that he loves me but he's not in love with me, and since our lease is up at the end of the month, if I don't want to renew he'd move in with the neighbor that he cheated on me with. I LOST it!!! I couldn't hold myself together and since we work at the same place, my boss laid into him about doing that at work and by text. He then tells me that he only said those things to hurt me and that he does love me and he wants us to work out and he wants to be with me. I asked him if he would quit talking to the neighbor and he said after he goes to court(did I mention that her ex-husband was abusing her in the parking lot of our apartment complex and my dear husband punched the guy and now said guy is pressing charges?!?).  He still needs to talk to her about the legal issues. I'm not sure how to take these mood swings and our relationship. I want to come home and I want to get on with our lives together and he wants some space. I just don't know what to do anymore. Any advice?