I haven't played through the full game, but I think the diving part is a bit boring, you just swim back and forth, and you don't really know where to go so you go to a dead end. I liked the boat swimming, so maybe if the diving part was more interesting and shorter? You could go to many different places by boat and then dive there to find interesting places/sunken things.
It's still a great game tho, good job ;)