LILT: Du Hast 1.1

I've revised Du Hast's opening lines, but think it might change the meaning too far. It does work, thematically, but the purists won't like it:

You
You have
You have me
You have me today
You have me today but I will not stay

Do you vow, till death do you part
To be faithful with all your heart

No

Do you vow, when her you do part
To love her when things get too hard

No

[lyrics][discuss]

I'm not sure whether I can keep it like this.