I would still go with Voltaire. He and Vico are roughly comparable on the subject of critical historiography but Voltaire produced a healthy shelf of actual histories which were, by 18th century standards, widely read. His were the best works available at the time on the history of the Holy Roman Empire, Russia under Peter I and contemporary French History. Vico, though important, (he was discussed in some of my university courses), did not produce a comparable body of works of history. Of course in those days most educated people were more generalists in nature, but of all of Voltaire's literary accomplishments, wiki lists his histories first, and not without reason.

"It is not necessary to have hope in order to persevere."