Bateel do lots of stuff, but pricey I think. Carrefour do lots of nice little plates with a variety of biscuit type cakes on them for only 18QR per plate... 40 pieces approx on the plate. Taste nice too !! Cakes from shops are usually plastic tasting, but Qmart make a few items that taste 'homemade'. They have savoury and sweet choices.
If you go onto expatwoman.com you'll find there is a woman who makes birthday cakes, fresh ingredients, and eatable rather than mush-in-the-mouth. Don't know the number for her though, they will have it though as she's often in the classified section.
Sorry this is a bit of a late posting, but at least you may enjoy a belated dining time.