I was talking to traffic dept today and they advised that an international licence is valid for 6 months. You do need to register within 7 days but that is only because they need to confirm your nationality allows you to drive without sitting a test. USA / UK licences are fine - no test needed.

Once your RP is sorted you can go to the traffic department and arrange for the transfer to Qatari licence - no questions asked.