Nothing really stopping you using both a stop bath and water. Water isn't really a stop you're just washing the film.