I have found a workaround for this that works, but it's....messy. Still, if no one can find better, this works.
Rather than editing/creating new entries directly with the form, I have used an append query, run with a button on the form, to take the values from fields in the form and insert them...