He is omnipotent too is part of the claims of believers. So he could repeatedly choose. An omnipotent omniscient God could choose to remake the universe countless times. He would already know all of the results ahead of time, but if we look at people we will see the same behavior where they will choose a certain behavior even if they know the result.
The problem with omnipotence and omniscience is that sort of endless self contradiction. My argument was against the concept because then no matter what a person did it was ultimately God's fault. Your point is a bit better because it shows the inherent self contradictory results of the combination of the two.
@dybmh cannot see how his "solution" was to limit God's omniscience. Buy if one limits a beings omniscience then it is no longer omniscient. My argument has always been based upon fault. Since the Garden of Eden myth misses the obvious. God is the one that was at fault in that myth. But I do like the even more basal approach that you are using.