Ahmad Rahi, Wajahat Attray & Noor Jehan