Thanks Sagres, that does make me feel better. He never hurts me out of anger, it's always along the lines of "I'm batman and you a monster, pow pow!" "I jump on you?? Ready? Catch!" Along with running a million miles and hour and diving into my lap for some cuddles or a talk.
I think I need some more redirection tactics. So far we use the trampoline and a ball to get our jumping and kicking out, but haven't found an alternative for the punching. Tried a beanbag, but he wasn't happy with that.