Hehe, I figured out how to make "Edit & Approve" create an "Approve" revision *and* an "Edit" revision once the editing form was submitted.
After the all, it was much simpler than the old "Edit & Approve" logic which created one combined revision, and even slightly simpler than the "Approve immediately once the entity editor is being loaded" approach which we discussed previously.
Now the editor has the chance to cancel editing without the import being approved already.