I recommend Astryd Farah de Michele
http://www.danceastryd.com/
She just started doing tours this year, I went in April...she pretty much tailored the trip for each individual so we could do the things we wanted to. Group activity including touring the museum, pyramids, and other sites plus the major dinner/dance shows, Tanoura show, and zar. She took us to the Khan el Khalili and showed us how to find the costumers there, Pharaonics, and Eman Zaki. If she knows beforehand what/who else you'd like to see she'll do her best to arrange it. She arranged both private and group lessons with the teachers we asked for. You're encouraged to go off wandering on your own if that's what you like and she limited the group size to under ten. My room mate and I spent as much time (or more) off on our own as we did with the group and we also did the Nile Cruise from Aswan to Luxor. Great fun! I'm not sure how Astryd would feel about including a husband/boyfriend, certainly doesn't hurt to ask.