You know how bullies thrive on fear and reactions. Well he is a bully don't fear him, don't react to him. If he does something like that again and you happen to be there just let him do what he wants as you walk away. Don't fight him that's what he wants you to do.
If he touches your locker again report it to your school. If he does something out side of school report it to the police.
If he gets too violent towards you there has to be some type of protective order you can get againts him where he can't touch you. Here in australia we have the Apprehended Violence Order (AVO) which comes in different forms such as can't touch you or can't go within so many meters of you...
That might sound like too harsh but remember he did rape you.
