...even though the right hand is being used to take the club to the top of the BS the club head is still getting behind me at waist high because of the over rotation of the hips.
That sounds like pivot controlled hands, though, don't you think, pulling you off plane?
The good news is your problem should show up in Stage 1-chipping and Stage 2-pitching, so why not revisit those (I start every practice session with Stage 1 & 2) and verify your alignments, allowing the right hip to clear as a result - much like it would if you were skipping a stone.