Try adjusting the rudder reactivity. It often helps in these cases. I have heard of settings between 65 and 20%