hardest time of this whole thing is going to be now but right now its a bad situation between you two and will continue to get worse like a bad habit, and bad habits are the hardest to break.
agreed, you never want to change the person you are to accommodate someone else's flaw, you think you are doing the right thing when its just letting it mold you and he will still have the same problem.
let us know how it goes, im sure he will beg you not to leave but its for the best, remember that. normally i dont like to have an opinion in the final call of relationships but you've typed so much that im just making a call from what you've told us.