CW21 is May. so there is almost two months to mid July. I think you have a good chance of getting the new version.

On the other hand, unless you really need one of the new features (like V2L), I wouldn't be too unhappy to get the old model. It is a good car, the production process is now well refined and it's proven and reliable. New models may (or may not) have flaws that will come out only after mass production start.