Go with what seems to be working and use the knowledge of what you have learned to avoid any future "bad experiences". Work on the love languages and the listening skills. If he is receptive, you should see some good outcome. Regardless of what has happen for me, I know what we learn here works. In my sitch, those who are dead set against rebuilding, will make sure nothing succeeds.
To me it seems this is not the case in your sitch. Take heart in this and stay strong and focused.
