Remote Deployment: don't delete folders on remote

I'm experiencing an issue with a project that has automatic remote deployment set up. Here are my relevant remote deployment settings (Tools => Deployment => Options):

Here's my current workflow that is causing an issue:

1. Rename any local folder that is directly mapped to a remote folder (not a folder that is inside a remote-mapped folder)
2. Press Command+S, triggering an automatic remote deployment (as per the options above).
3. The folder in question remains on my local with the new name, but is deleted from the remote server (which I don't want to happen).

I know this is because renaming a folder breaks the local-to-remote mapping. My question is, is there any way to avoid the remote folder being deleted? I would think that having the Delete target items when source ones do not exist option unchecked would prevent that, but it still happens even when that option is unchecked. Hopefully, we'll be able to find one of two resolutions to this, and I'd be OK with either one:

1. Prevent PHPStorm from deleting folders on the server, or from deleting files and folders, so that the local (and renamed) folder is no longer mapped, but the folder still exists on the server with the old name
2. or, automatically adjusting the mapping when Command+S is pressed so that the local and remote folders remain in sync.

Thanks in advance for your help!