There's one dungeon in Jabu Jabu's belly that has the water-level changing elements of Ocarina of Time and Twilight Princess' Water Temple.
My problem with Vaati... I kept getting hit by those fireball things he shoots, and for a while I coudn't figure out how to beat one of his forms. Also, I didn't have but one or two fairies.