Settings to create new revisions vs. user options on node edit form

For each content type you can specify when new revisions should be created:
- Only when saving "node type" content that is not already in draft/pending moderation
- Every time "node type" content is updated, even when saving content in draft/pending moderation

My setting is "Only when saving page content that is not already in draft/pending moderation". However, when editing a pending revision the user sees the "revision information" block on the node edit form. This block has two options:
1. Create new revision
2. New revision in draft, pending moderation

I believe these options are confusing because the user is already editing a pending revision (and there can only be one pending revision according to the settings). In that sense the option to create a new revision is not possible in combination with the setting to create new revisions only if content is not already in draft/pending. If the user ticks the box to create a new revision, it will in fact not create a new revision, but overwrite the current pending one. Depending on the choice 2 about the pending status a user could cause issues when used in combination with workflow (state-based workflow changes and revisioning). In my case a workflow state is supposed to publish the latest pending revision. However, if a user opens the pending revision directly, edits it and ticks create new revision (without ticking the second box to have it in pending), the revision gets actually published, thus circumventing a workflow change.

Maybe it would be possible to hide revision information by default in this case (content type setting = create revision only when saving page content not already in draft AND user editing a pending revision)?