salam. i suggest you visit the FANAR Islamic Center. it is located opposite Souq Waqif. it is better to speak to an imam there in order for you to have a clear understanding of your situation.