Take the first two sections, any way. Sections A & B are the same as(accepted in place of) the future 1 & 2, but the future test will cost more. If you have trouble with hand graphics wait to do the graphic sections after the change otherwise take them when it makes sense for your career.
If you don’t feel ready to take them wait, although there is plenty of study material for the current format and who knows what the next will look like.