You must go to Hanna/Urk .. the most popular of them all .. you have already been to peer ghaib bibi nani etc .. Night view of mariabad is amazing .. for food Mir Afzal karhi .. Sajjai and Cafe China for memorable Chinese food .. For shopping go to Wadood Shah market .. you never know what you may find there.
As for the Afghani food in Lahore .. I have been to these place but nothing compares to the quality you get in Quetta.