In the meantime, have you explored using workflow to create a deal from your form?
You could duplicate deal properties as contact properties, create the form, then on form submission, launch a workflow that does the following:
- create a deal
- copy the contact properties to the deal
- clear the contact properties ready for their next enquiry.
Much better to have deal properties on a form. Absolutely. But this solution might work for you in the meantime.