im not sure if my answer is too late but i can give you some advice from an islamic point of view as there have been issues that i have faced as i wear the hijab(head scarf) and full jilbab (long overdress)
as far as general massage is concerned most muslim women would be fine taking off thier hijab and other clothes in front of other women but in no way in front of men, although the area between the navel and the knee could not be seen or touched even by another woman so obviously no massage on the thigh area. this rule is exactly the same for muslim men, as they can only be touched by men and they cannot expose or be touched in the area between the navel and knee either.
as far as aromatherapy is concerned no oils containing ethanol alcohol or alcohol denat would be permissable as that would be classed as putting something unclean on the skin and would invalidate the prayer of a person although chemicaly manufactures alcohols would be permissable.
i cant think of any other problem that would occur but if i do il let you know. if you have any specific questions il be happy to help!!
take care
haneefa x x