Haki is definitely stronger. A devil fruit user, even if their devil fruit is op, becomes useless in a fight where someone has haki and they don't. We see this after the two year time skip.
Haki allows Luffy to even pose a threat, the devil fruit power just expands how much of a threat.
