Historiography roundly rejects both great man theories of history and national will theories of history. Both are considered pre-"modern" in terms of accounts of the past. The idea of "the individual" and action are both suspect. "Will," is generally rejected. The idea of summation of individuals producing a spirit doesn't exist. "Great events," are also rejected as such.
Basically, reactionary conceptions of the world are rejected historiographically. Conservative or non-conservative liberal views have had to accomodate systems and process in order to be accepted; though quite often this is achieved by isolating the subject of biography from the forces of the world or their engagement, and instead focusing on personal process minutæ, even if these minutæ comprise cabinet meetings of a man who liked to appear as a drunkard publicly. Attempts to preserve a grand history of whiggery, as if the world were naturally capitalist and British are laughable and widely laughed at by the discipline (the reaction to Fukuyama's Hegelian worship of Americana, for example.)
While efforts have been made to preserve the individual or action, they have done so by retreat, rather than advance. The individual's action exists constrained by a documentary horizon that neuters any of the great claims of determinative actions: while white European men may exist to be historicised, their historicisation relies on feeble appeals to cultural myths about, for example, World War I as a determinative process which my subject participated in….
At the conceptual level you seem to want to engage in, the field is dominated by institutional analyses as if laws and cultures have meaning, contrasted with historical materialist analyses as if classes existed. Tolstoy's contradiction is one of a long past age where "Dieu et mon droit" ['God and my right'] was being debated in a recapitulation just as it became obsolete. The obsession with will and personage is not accepted scholarly practice in the discipline of history: historiography is defined at its core not by the meaning of the past, but by the explanation of the documentary record of the past.