Each of these two games is perfect in its own way, though there are some changes I would've added...
In Ocarina of Time, I would have made Ganon' Tower an inmense dungeon, which would test your skills to the maximum point, with some medium enemies and hard/crazy puzzles, along with Ganondorf...