Uh, no, don't use "softness." If you see him in public, draw as much attention to yourself as possible. Scream and stomp and yell expletives so people are shocked and look at you. If he dares touch you during all that, you've got lots of witnesses with no doubt that you were scared for your life.
I would also change your email, and use a relay service with the new one as well. That way if he figures it out, you kill the mask but keep your main email. I'm a fan of this one. http://boun.cr/
If you're using a phone that they gave to you, get new hardware.
Is someone trying the password reset feature on you? If so you should change your email to an email that is forwarded to the email you are using now.