If you’re going to have Shouta time travel through water, then have him Yuuki Rito his way into a girl’s bathing room somewhere, expose all the JCs in all their naked glory, THEN have him magically disappear in a time warp before he gets beaten up/arrested.