I had all those conversations with my wife before we were married as well. Everything was cool until we had kid(s). (S) is in the oven, due in August. You'll be fine until you have kids.
Kids are like the clause in any and every contract. But if you've found the right woman, you'll be alright. I started smoking cigars after I got married and my wife has been cool with it. Now the $1500 Taylor guitar, the basement studio, the $1200 gibson... I really had to fight for that sh.t.
Then again, my wife doesn't really know what I spend on cigars and God willing, she never will.
Congrats!