I can't imagine how or why a partial spay would be causing all her other symptoms. I would, however, take her back in (when she's medically able to have surgery) and have the spay completed. I have heard of dogs being spayed and they leave enough tissue behind to cause false heats. Removing the last bit of reproductive tissue resolves the issue.