Remember that the clubshaft remains fully on a flat tilted plane. Sounds like the clubshat is below the inclined plane on either bs or DS.
The shoulder motion supports the clubshaft. Be sure the shoulders aren't leading ( pivot controlled hands) but supporting the hands moving back up and in on plane.