A friend of mine is adamant that the Gog/Magog war will only happen after the millennium, as described in Revelation 20 but I am of the opinion there will be two Gog/Magog wars; one prophesied in Ezekiel 38/39 and the other an attack by the enemies of God at the end of the millennium. Just like there was WW1 and WW2 with virtually the same countries in both wars, could there not be two Gog/Magog events?
I think the problem lies in your use of the name “Gog/Magog war”. Although Gog and Magog are mentioned in connection with both Ezekiel 38-39 and Rev. 20:7-8, neither event is referred to as a Gog/Magog war in the Bible. Also, by comparing Ezekiel’s description with John’s you can see they’re not the same, and don’t involve the same participants. For example, Ezekiel’s battle involves only nations from the Middle East, and not all of them, while John speaks of the nations in the four corners of the earth, signifying people from everywhere. Ezekiel clearly describes events that follow his battle, meaning it’s not at the end of the age, but John is describing something that happens on the threshold of eternity.
If you can agree to stop referring to both events as a Gog/Magog war I think your problem will be solved.