Yeah, I always saw the ending to Wind Waker as also a response to those fans who clamoured for "Ocarina Mk 2" after Majora's Mask, and during the previews for WW.