Further improved reliability of M2M fields in ContentType models.

Small update to ensure the correct form field type is always applied, regardless of whether there's a DB object or not.
Separated out the m2m field saving from the main fields to stop a model error from occurring.