Yeah, I noticed this when MM came out. All the 3D Zeldas have followed this. Even Wind Waker sort of does. While there is no water dungeon (except for the Tower of the Gods as Hylian Hobbit pointed out,) and mixed up orders, the three basic ideas are still there, and there's the Water/Ocean God...