If you want to be on the safe side, just wait for the official announcement. That shouldn't be a to long wait. All variants should still be available and maybe they are again a little bit cheaper.

I will definitely wait until I get the first reports, if I'm right with my expectations regarding battery life. I also think at the beginning there will be some annoying bugs. just like the time when Sailfish X hit the market. So this time I don't have to be the first one.

If I'm wrong regarding battery life I will stay with my X. The XA2 is at the limit for me regarding size, so Plus and Ultra are no options for me.