Try to do a windmill in slow-motion. Focus on keeping your legs apart. It doesn't have to go really smooth. Especially getting back on your stab-arm is difficult in a slow-mo windmill. But it'll make it an automatic process for your body to keep your legs apart.
There's a lot that has to go automatically in the windmill, teach your body those things one at a time.