Hi Robert,
Your individual decision will depend entirely on your circumstances and preferences. But I was in your shoes back in 2018 - on the cusp of a previous exam version change.
I elected to go ahead with the existing format since I had already put in a significant amount of work on the then-current format.
I find that having a hard deadline can be a great motivator!

It worked out for me, and I ended up managing the focussed study needed to pass before the exam pattern changed.
For you, a few considerations you may want to factor in are:
1. What are your other commitments in your present life-situation (work-life-balance/ unavoidable travel lined up / childcare that is a constant, etc.) - taking all these into consideration, do you think you could average a daily study of 30 minutes, with occasional longer bursts of time (perhaps over weekends) - to take tests? If yes, then you could consider powering through.
2. How comfortable are you with the current format and the "language" in general? If you are reasonably comfortable, then - again - consider sprinting to the finish line before the change.
3. Take a few tests to help you calibrate - if you get to the ~70% mark reasonably quickly - again - that is a sign you are probably ready to give the test relatively soon in its current format. (I would advise trying to consistently hit 80% before giving the real exam).
If however, you have certain constraints that make the above course of action risky, and you do not have much to lose by waiting, then you could take your time.
The new format may take time to get established in the sense that you may want to wait a bit to even rely on tests that incorporate the new exam.
Ultimately your call - but in your place, I might pick option #1. Best of luck either way!