HD, if it makes you feel better that you are not rapist for copping a feel, I did 10 minuets of body rubbing that included breasts. I even licked a nipple and asked BB if it was the Chocolate or vanilla one. No sex though.
I described your M to BB and her opinion, based on her working with clients with personality issues, is, your W should not be M , she has what might be a personality disorder in some areas of her life, she might have a form of PTSD. That is not a diagnosis, just an opinion or some subjects to work on in counseling.