Two quick suggestions 1. Make कहाँबाट a part of Radif by placing it after Qafiya. Reads better 2. I will be tempted to convert the whole ghazal into one with a short meter like your 'पिटिएर सुन भईनँ' . Will be an interesting exercize.