I would go for Crocodile, he is a mastermind and a genius. Even though beaten by a pre-timeskip Luffy, post-timeskip crocodile is OP. It's stated by Oda that he has haki and he is even the mastermind of Cross Guild.

Lucci with Advanced Haki is a VERY CLOSE second.