I'm currently testing some changes:
The CM Diancie works well!
The CB Machamp, not so much. I've tried replacing him with Jirachi. I'm desperately looking for some priority on the team. The defensive orientation means I often barely miss kills. If pokemon set up, I can't get rid of them...