Yeah I did it after getting the leaf. I think it's great how we can do these things in whatever order we want. Like I got one of the maps to the triforce pieces and I haven't even been told about them in the game yet.