Not that this would solve the problem or anything, but I would much rather the two options "buttswing" and "headbang" could just be turned into a "dance" option, for those who enjoy it, so it could be generic enough that it would be less likely to be used in a sexual manner.
__ I having never used them besides to see what they looked like when I joined, wouldn't care if these options were removed entirely from the game.