are u sure that u are getting accomodation. my western friends ,also in QP and on a two year contract, were promised accomodation but told to move out of the company villa in 3 months. As per the new rule u can continue living in the company villa only if u are on a 1 year contract. ppl on 2 or more year contracts have to move out in three months (extendable by another six weeks). looking for decent accommodation with in QP limit is next to impossible.
frankly ur riyadh option sounds better.
best of luck