That is a good plan. I would also tell him educate him a little and tell him how to act. I can give him he benefit of the doubt and assume he is ignorant and insensitive at best. So it's good to know saying those things made you uncomfortable, but if he's that ignorant you might need to tell him how to act. Namely, being patient and letting you speak and definitelya not questioning or giving advice on something he knows nothing about. To be honest, I would document this down somewhere because if things don't improve, I would think this is a total HR violation. I know that doesn't sound very nice or fun, but I would do it as a _just in case_. If things somehow get really bad, you'll be glad you have documented details at the time.