Since gratuity is legally mandated in Qatar, it is not recommendable to incorporate housing allowance and other allowances to the basic pay. lump sum option increases your end of service payments exponentially.

as to the pick and choose option, if you have more than a hundred staff, that would be an administrative nightmare.

IMHO.