I saw a list somewhere on some site, wish I could remember, that listed the pros what they won, their best dances, and their overall strengths. I feel that a rotation of pros with their styles being utilized by them with the stars would work.
For instance if a pro is the current jive champion than they do jive with all the celebrities of the opposite sex. Cheryl clearly stated the AT was her dance, so have her do it with all the stars. I think than the star would be voted on and not the pro, and it would be more fair. Every week the fans and judges could vote for their favorite pro dance and at the end of the season the pro with the most wins could get a trophy, and the star that was voted through would get the trophy.