Abstinence...living together

I need help. My boyfriend an d I have been together for a little over a year now. We live together. About two months ago I got a word from God telling me to return to celibacy. I obeyed right away but I've been struggling seriously. My boyfriend is not Christian but her understands my relationship with God and is on bored. However we still do the little touching things to get each other off. Is this ok? Can we still manually stimulate each other? Is this truly abstinence?