I'm not sure about details of what the right behavior would be, but needing to "fixme" a patch is such a common use case that we should be supporting it with something a bit more concrete than the "WIP" commit summary prefix.
To -1 or -2 your own code is a decent workaround, but that doesn't communicate much about the actual status. I guess, if we were able to put a patch back into the "draft" state, I would like it to disappear from the main watchlist, it could not be merged, and draftiness would imply something about your intention to fix the damn thing one day.
Version: wmf-deployment
Severity: enhancement