If you mean the bath scene with Shinobu, that was in ep4. I do not understand why it would make you squirm uncomfortably, but then again, I'm just strange. Anyway, I kinda like this style. There are two things that are kinda faulty in many animes (among many other things), and that being either the pointless fanservice or the boring scenes, where exposition happens, but really nothing happens just people standing around talking. That scene (and many others in this and the previous series) actually mixed these two aspects together and made them to be balanced out by each other. So we have fanservice, that is not pointless because there's exposition, and we have exposition that is not that boring due to fanservice.