Sahir Ludhianvi has written both the verses
Kal aur ayenge nagmon ki
Khilti kaliyan choonewale
Mujhese behetar kahenewale
Tumse behetar sunnewale
Kal koi mujhko yaad karhey
Kyon koi mujhko yaad karhey
Masruf zamana mere liye
Kyon waqt apna barbadh kare
Versus
Tujhko Mujhko Jeevan Amrit, Ab In Haathon Se Peena Hai
Inki Dhadkan Mein Basna Hai, Inki Saanson Mein Jeena Hai
Tu Apni Adaen Baksh Inhen Maein Apni Wafaen Deta Hoon
Jo Apne Liye Sochi Thi Kabhi, Woh Saari Duaen Deta Hoon
Main Har Ek Pal Ka Shaayar Hoon…
Contrary to popular opinion I find that the first verse is more liberating!