I think I’d not wait for later but rather address everything up front. Like if he made vulgar joke, I’d say right away “honey I love when we joke and play around but I really don’t like vulgar jokes. Let’s joke but keep it clean please. What do you think? Could you take that joke back or maybe rephrase.”

I’d not let it brew in my head. Just speak up. It doesn’t need to be a buzz kill as it doesn’t need to be an argument. Just polite and calm awareness right on the spot.