yes, the souq is the best place. Did you know that Dr Walter at Doha Vets is a bird speacialist vet? He is great for dietry advice and check ups. I'm sure he won't mind speaking to you if you call there.