Hello,
I have a few sugestions. To start, although machamp is great either way and each has its benefits, you could give machamp guts and close combat instead of dynamicpunch that way when you rest you get a huge boost from guts while having as much accuracy as before.
Also, try changing...