Firstly, anybody that thinks Doha is bad can't have travelled very much. It's nothing compared to places like Miami, Newark, JFK or Trinidad. I've often waited three hours at imigration in those airports.

Secondly, get yourself a new electronic residency card and you'll breeze straight through.