My thinking at this stage is that the HF4All versions will be a separate edition because of the volume of terminology changes needed; and I might have to do a kickstarter in order to fund making these changes. So at this stage I can’t promise that the documents you purchase will include this.
However, I am thinking of releasing a (slightly more expensive) Infinite edition which will effectively buy electronic copies of both editions in advance - if and when they are produced. Would that work for you?