Actually, I think my new algorithm fixes this -- and without any dedicated "swaying" edge case!