I considered changing Warlock Punch, but... I dunno, it's just really one of Ganondorf's better attacks, and I don't want to screw around with it too much. I might even get around to a Ghirahim moveset...
I found Warlock Punch to be Ganondorf's weakest move overall, it was so slow and predictable, it wasn't worth using. Using a sword wouldn't change it too much and the extra range would make it much easier to use in a battle.