I just noticed something very interesting on page 11 of the SPA i signed with First Qatar. Clause 3-2 says:
"the seller confirms to the purchaser that the form of this agreement has been aproved by UDC as required by the Principal Agreement and that it has fulfilled all its obligations contained in clause 13.5(h) of the Principal Agreement"

ALSO, on page 15 clause 7-2 says:
"Notwithstanding that a certificate may not have been issued, the Purchaser may occupy the unit from and including the completion date:

SO, LET'S JUST ALL IGNOR THE ADDENDUM AND JUST MOVE IN ONCE THE COMPLEION CERTIFICATE IS ISSUED.