YYuYour best bet is Doha Sub-Aqua Club, they go every weekend. There is a similar group in Al-Khor and Dukhan. DSAC are a BSAC style club (they accept PADI, NAUI etc,). They are more club orientated rather then commercial like some of the shops. Look DSAC up on the interent. Best of luck and safe diving.