Give machamp payback in place of stone edge or ice punch, i'm fairly certain nothing shy of a lum berry flying type with dragon dance is going to just set up on you or even take a dynamic punch in stride unless it's name is Gengar, Dusknoir, or Rotom.
Give Heracross Nightslash or pursuit so it...