I am very happy for you! Perhaps you could consult the priest at the Catholic church here in Doha to find out about the legalities of marriage in Qatar for two Christians, one of whom is a non-resident. I wish you two all the best! Let us know how it turns out.
Mandi