Baton Passing is kind of a waste of Medicham's talents...
For the Substitute set, just stick Rock Slide over Focus Punch, and a Jolly personality over Adamant. (Lucky me, I get to meet Meowth346 this weekend, and he's got a Japanese Fire Red he can teach Substitute to my Medicham with.)
And for your "ingame" set... Hi Jump Kick works fine over Brick Break. Also, there's no need to go Jolly (Adamant is fine), and you can put all effort into Attack and Speed. It's better that way.