Definitely sounds like you're on the right track hun!

Keep it up. They say it can take maybe two or three weeks for a habit to be broken and re-formed so hang in there a bit longer. DH can deal with it I'm sure