Wedding Dalema

So I'm getting married here in about a month and I have 2 conditions for my fiance when it comes to the vows we say to God.

1) instead of "until death do us part " I want "for all eternity " because we will live eternily with God

2) I want my fiance to be sober when he says his vows to God

We are marajhana smokers and while I'm fine with smoking 99% of any other time I'm not ok with it in front of God. When I talk to God I want my head clear and free of any con webs or fog. I want him to HEAR what he swears to me and God. Please don't judge, hate will be reported.