Is this workplace bully going to keep pestering me?

I work with a guy that is in charge of office security, but other than that he is not my manager. This guy used to be a boss and still thinks he is. He has been harring me daily about things not related to security. One day I was tapping my pencil on my desk while I was waiting on the phone, and only did it for a few minutes, and he told me I was doing it for 20 minutes. The girl who sits next to me said she didn't hear anything. He sits nowhere around me. The next day he wants to confie my notebook because it isn't one of the office steno pads and it was a blank pad that a coworker gave me because they were out of steno pads at the time. The next day it was for using the bathroom at 5 o'clock and he tries to lock me out. Told me I have 30 second to evacuate the building. I was like what?? Then he said you have 15. He said he would have locked me in the next day b/c he wanted to get home to his family. Then he wants to know what my insignia was on my capris and wanted to know if they were anti military. They were just a flower design with a mock insignia. Then he tries to take my tupperware out because I forgot to remove it on Friday. I told him I would get it and he goes to the fridge and removes it. The list goes on and on. He also pushed his body up against mine one day when we were taking some group pictures. I was standing by myself at the back of the group and he comes out from nowhere and pushes his whole body next to mine and stands there and doesn't move. This guy is a total jerk and today I went to management finally and reported him. I couldn't take the daily harrment. Anyway, the boss tried to candycoat it and smooth things over with me. He said maybe "Johnny" was just joking. LOL. He was no more joking than a tiger who is about to prance on a lamb. This guy is creepy and he gives me the creeps. He has been watching me all of the time and following me. Today, after the boss called him in, he laid off. But, I really think this guy might be trying to get me fired and try to get me on any infraction, especially a breach of security. What should I do? I am afraid to make a wrong move b/c this guy is always watching me. He was in the military and was in combat in Afghanistan. I personally think it screwed up his brain. BTW, he has harred a lot of other people and got a top guy fired because he had his phone on silent mode. Any suggestions? I want to keep my job, but every moment of my work day I keep thinking about this guy and what he might do. I think he could be dangerous to me physically or otherwise. It is the way that he looks at me that frightens me. It is that Ted Bundy kind of look, and it scares the h*** out of me. I have been trying to hide this and stay out of the way, but his behavior toward me has been escalating. Today, after I talked to the boss, he promised it would be better, but I somehow don't think that it will. BTW, my boss is very weak and lets others run the show so to speak. He is the peacemaker and thinks a gentle tap on the wrist is all that is necessary. I don't think it is going to deter this guy. Any suggestions? I want to keep my job and I want to be able to deal with this very difficult, controlling individual who I have to work with. Thanks if you can help.