Dance blocking plus and refining

The last 2 weeks have been extra hard. After having studied the dance I'm animating I realised how hard it was going to be to animate. I've noted that for a dance to be well animated I had to make sure that the different body parts were not changing directions at the same time. For that I found myself putting a big amount of keyframes and ended the blocking plus stage with nearly everything on 3s and 2s. Even that wasn't enough when I moved my curves into splines. The refined version isn't finished but right now I have a very big mess with my keys. I tried really hard to keep everything organised but I think that the last stages is really difficult to keep clean.
Still looking for a solid workflow.....