ok man i analyzed the match-ups against elite4 and i found something. It seems that Machamp is nearly useless against them, and what he does can be done in the same way by a strong Fire type, which means i would like to replace it with a Magmar, as you metioned, because it comes not much later...