I do think the producers, dancers and celebs should really discuss their expectations and hopes together beforehand, to avoid situations like this, where Robert was clearly dying internally of horror at being made into the Comedy Contestant (just as Scott Mills was before him, poor sod). Bill Bailey managed to avoid it, I think because both he and Oti are both very strong-willed, and would not allow themselves to be pigeonholed.
Perhaps instead of pairing people up by height, gender or location, they should pair them by temperament first. Therefore Dianne -who apparently cannot say no to a neon-flavoured comedy routine, especially on theme weeks- could get an equally bouncy contestant who would adore being painted yellow, or blue, or green with googly eyes and a tail on. And a contestant who would rather twirl around the dancefloor in a nice outfit could get Gio or Kai.