I would say probably ease up with your daughter about now but when your son comes stick with the practice at least through puberty so his transition to high school showers and body changes is natural.
A good time to make the shift would be when your son arrives and your wife could then take on your daughter.