Obligations of developer toward the contracts and area of purchased units

I have an issue with a real estate developer. In July 2018 I purchased 2 units, a studio and a 1 bedroom. The 2 instalments for both units have been paid to the developer's account and NOT escrow account.

Since signing the reservation forms, I was following up to receive the contract attested by Dubai Land Department. No one until now provided me with the contracts although I am following up for 6 months now.

I also mentioned that there is a problem with the area of the 1-bedroom unit and they said it was already corrected verbally.

No one from the Customer Service sent me a proof that the payment was wired to the escrow account for both units.

To resolve the problem, I asked for a replacement of the 1-bedroom within the same budget which I purchased in the first place with bigger area in high floor, good view, with the escrow account.

I asked them also to send me contracts within 2 weeks from my notice before raising the issue to legal parties.

Please let me know if the action was right and what I should do next.