The only solution to the Terminology Problem I've found has been to treat it purely as a character issue, and use whatever word the POV character would use.

(In the case of one fic I beta-ed for, this actually resulted in the author and betas polling various male friends and partners re: word choice.)

Also, eroticizing Teal'c is for the win.