simon, i agree with everybody else, it is normal to be extra aware of touch when touch has been so used against you.
It does ease up over time, especially with therapy and self work. i used to be afraid i would clobber somebody without thinking, if they came up behind me and suprised me, let alone add touch to suprise.... I warned my friends I had hair trigger elbows, they could suprise me at their peril. They took my words to heart and didn't go there. Boundaries. You have a right to say where yours are and defend them.

Learning how to set boundaries and take care of your emotional self are essential skills for healing. You have been working your bunns off to accomplish this task,on many fronts. You have been very brave. Good job, dude, good job.