If this is your first time, you'd better go with a travel agent (Hamla). They arrange for everything and most of them have both Air and road options. They take care of the visa, arrangements for kids or other things. Omra is felxible if you travel by air. You can choose the number of days you want and if you want to go to only Mekkah or to Madinah as well. They also provide booklets and religious consultations about how to make Omra.

There are several Hamlas in Doha. Here is the contact information of one of them: Al-Quds: 4317520

Good luck