Ok, I've soldiered on today, blasted through the Water dungeon... killed Dark Link with the Master Sword (admittedly I did lose all of my 9 hearts and had to use a fairy, then I remembered not to use z-targeting), then went back in time (for the first time in the play-through) and got the lens of truth from the well, back forward in time and went through the Gerudo fortress, and found the colossus. Then back in time again to do the child portion of the Spirit Temple (I realise I could have done the well section in this bit of time traveling but well, shush) and back forward, and completed the spirit temple... And finally just entered the Shadow temple and did the first bit (finding the hover boots).
I don't think I'll bother doing much more than the main story anymore, I will pick up skultula and pieces of heart as I pass them as usual, and as I have started it, I may complete the mask quest. I want to move onto Majora's Mask too so will probably ignore Master Quest.
