So my takeaway is that the writers are at least going with Year One as, relatively, the current origin (the War On Terror is I guess supposed to be relevant to why Sears was as big a deal as it was) until told otherwise.
The only one who seemed invested in the WWII origin for Diana was Scott Snyder and I guess Dan Didio.