Gestahl would actually make for a cool boss fight. He could just fly the coop once you got his health down far enough, allowing him to die later the way the story intended.