so lth, in a recent post, you indicated that your 10yr anniversary is coming up and you M has been "mostly" as it has been recently.

This I believe is the most important hurdle the two of you face. Now and in the past, and into the future if it is not dealt with.

And as you dealt with it in a destructive way last time, here's the million dollar question...

How can you change your behaviour in how you react to how he behaves when he is "mr. potty pants"? Because your past behaviours (reactions) and his, are why the two of you ended up where you were. Now is your chance to do something different.