what I thought, I don't know the types very well. Psychic is still good, but I don't know If you can get the elemental punches, that is what he typicially picks up for his other moves.
Calm Mind, Psychic, and 2 elemental punches if you can trade to emerald or are willing to breed them. Otherwise... Recover and trick maybe? He doesn't have much coverage without them.