Take the easy way out.

Why actually know the material well enough to apply it in a scenario that reflects something you might actually do?

You know the PTS as it currently stands. So does your CFI. So does the examiner. Things will go more smoothly if you get it done before the rules change. Whether it is "easier" or "harder" won't enter much into the equation as your instructor will help you know how to prepare for it if they're worth what you're paying them.

Do you know how to tell a pioneer?

He's got an arrow in his back.