Hi CG,
Definitely work on you. And don't rush into marriage (I noticed you said fiancé). I think we tend to chose people who have similar habits to ours as it is a comfort zone where we won't be judged. Sounds like you are changing your habits, but unless he too wants to make a change in his, this behavior from him is what you have to look forward to if you marry him. Chose wisely.