I hope everything works out well for you. I will say that you seem rather invested in the idea that he needs to work on changing himself. But people are often unwilling or unable to change a great deal, and actively trying to change someone else can lead to an unhealthy dynamic between the two of you and/or leave you feeling very frustrated. I'd just watch this aspect and see how everything unfolds.