Sword and shield combat in OoT was boring:
Step1: shield
Step2: wait for enemy to hit shield
Step3: hit enemy back
Rinse and repeat until enemy dies.
Shield never fails... that sounds like a meme, lol.
Anyway I think TP style Hidden Skills (with cooldown maybe?) combat mixed with SS style...
Just don't make it like Majora's Mask OK? That game was depressing. Even when you help someone, you play the song and they are doomed yet again, don't play the song and you're all doomed anyway.
If there were to be a fourth timeline, I would prefer it be the one where Link vanishes (last time he draws the master sword) because that still goes unexplained. From my point of view (game perspective) you draw the master sword, defeat ganon, then get sent back to before you drew the master...
Pretty much this, but instead of the "I'm wasting my time, I'm leaving" thing Girahim did, I think that he should become enraged and Link is forced to retreat, possibly resulting in a chase scene.
After using the gamepad as a map for Sonic&AS:RT I'm not too sure about using the gamepad for a map anymore,but maybe just because it didn't show the whole map and had that obtrusive rear view camera at the top of the screen... I dunno.