Cruise Planner still shows Princess Cays, so hopefully this will remain the plan. We actually have already been to both Princess Cays and HMC on previous cruises, and were looking forward to returning to Princess Cays (although, as you say, HMC is not a terrible substitute should that occur).
Many thanks to those who provided helpful answers - much appreciated.