Was ungraded to a deluxe suite which was very nice-bedroom, sitting room, plus a small kitchenette type area (no cooking facilities but there were kitchen cabinets and thing to make tea/coffee). The bathroom was very nice with copious amounts of Bvlgari products.

I wouldn't expect free airport transfers with an upgraded room. You don't find out for sure even what type of room you will have until you arrive so why would you expect something which was not included in your paid reservation that is also not a gold/platinum benefit? If you don't want to pay for a cab, you can easily take the metro and the connector bus and pay less than 7 dirhams.