Ok go further with your version, I'll go with mine.
Just one thing: it's dangerous in latin to focus only on the meaning because often (read: always) if you dont' look at the grammar, the meaning is completely different. That's the first thing you learn at school. Expecially for us, words are often similar to Italian, but have different meanings.

In my first verse i used UNTIL, that's not in the lyrics I know.
The second verse should be right, I think amandum comes from amare.
The third verse, I think I heard it correctly, I just forgot to translate the gerundium. It should be I will see you in the morning at the time of the awakening.

I translate closer to my words than you to yours, then please don't say in youtube that I have so a big amount of errors in my version, and if, show them.