Try to use just KillMode=mixed for some time. I know testing will take loong, but I do not see other possibility right now.