I don't know the situation, so my take may be in error. In general, telling someone as personal as being a masochist is inappropriate unless there is proper ground work. This is especially true in the work place. It sounds like he is getting his kicks at your expense and is trying to top from the bottom. Frankly, I would be angry and discourage this behavior.