You don't actually need shinji to do the underwater section, you can swim at the ceiling and clip through the bricks (it works everywhere in water in this game)