Welcome to the Forum.  I will try to help.  I will do that by providing you with some facts.  Before I do however, let me challenge your supposition that your masseuse was HIV+.  The odds of this are quite low- most commercial sex workers do not have HIV.  Having said that, we have had many questions of the sort you ask over the years.  Thus, based on my more that 30 years of work in the field, my own research, and my reading of the scientific literature I can say:

1.  Much research suggests that persons with genital herpes are at somewhat increase risk for HIV IF exposed through sexual contact.  This increase is about three-to five-fold.  Having said that however, HIV transmission through ANY sort of physical contact is quite rare.

2. There are NO data whatsoever to suggest that acne, active or otherwise is a risk factor for HIV acquisition.

3. There are no data to indicate that HIV is spread through rubbing or other forms of masturbation, even if an infected person who is performing the masturbation has active lesions or cuts.  Similarly there is no evidence that HIV is spread by the direct or indirect transfer of genital secretions to person to person on someone's hands or through skin-to-skin rubbing.

Thus, I am completely comfortable in telling you that the activities you describe constitute NO RISK activities.  This is the case even if the "dot" you saw on your penis was a herpetic lesion. There is no medical reason to seek HIV or other STD testing related to the activities you describe, nor is there any reason not to resume sexual relations with your wife. 

I hope my comments are helpful to you. EWH