Warren,
You may have heard it before but it's worth iterating. The PMP is not an exam on how you do projects (I.e. you think in terms of deliverables and timelines) but an exam of how PMI thinks projects should be executed. You must simply get all thoughts of "how I do it" out of your head if you hope to pass the exam.
My best advice here is work with a solid PMP Exam Simulator. OSP (here) offers what I consider to be the best as it really gives a great "feel" for the types and difficulty of questions that the PMP exam presents. Of course, you will need to go through the 35 hours of PMI-approved training before taking the exam as well.
Alternatively, you can get your exam done before the changes are implemented.
As for the calculations - that's anyone's guess right now. But, based on what I see, the exam has never been math-heavy. When I took the exam in 2019, there were two questions that involved calculations and one of those the answer was just plain obvious without actually using a calculator. When my daughter took the exam in 2022, there were no true calculations on it, but rather subjective questions like if a variance is negative, what does that mean?
Good luck!