No Calamity Ganon and less Ganon.
Ganondorf is a great character, and is certainly and without a doubt the most badass villain of all time in anything, and is in my top 3 Zelda characters, possibly being number 1.
Ganon is overused and dull. Ganondorf has better personality, look, backstory...