When should I stop bathing with my son?

I’ve been showering with my son for about a year now. For some reason, when my son turned 1 he randomly started hating baths and water in general. The solution that worked the best was having me in the shower with him (it’s the only way he doesn’t scream bloody murder when he goes under the water). My son turned 2 a few days ago and my fiancé thinks I should stop bathing with him as he’s reaching the age where it’s becoming “uncomfortable”. I don’t agree as our son barely speaks, let alone understands body parts, but now I’m not so sure. I just assumed I’d stop whenever he began pointing out the female anatomy. When do you believe is the right time to stop showing with your kid? Specifically a child who is the opposite gender.