When I used to travel a lot, and encounter all sorts of strange rules, I just had 2passports. Both with the "lots of pages" option. Passport Office were v helpful. Even with 2, I can remember waiting for couriers with passport in various part of the world.
Passports are so important. I always renewed early.