Another factor to throw into your decision making: familiarity.
Familiarity is much underrated, IMHO. I often see people on their "dive trip of a lifetime" struggling to get their brand new camera to behave itself.
If you've got enough time to get your new system, set it up, and spend quite a few hours playing with both above and underwater then, yes, get a new system. Or, if you have played with so many systems over the last couple of years, then picking up something new should be easy enough. But the last thing you want to be doing is floating around on the bridge of the Saratoga trying to figure out which button does what and what setting works best in this lighting situation.
Better the devil you know than the devil you don't.
Walker's Law of Familiarity: buy a new underwater camera system no less than 3 months before an important trip and spend at least 10 hours using it, reviewing the results, adjusting the setup and figuring out its lighting and focusing behaviour through at least 3 cycles before the big trip.
The 10 hous is just indicative and can be spent on the kitchen table, in a pool or at your local dive site, but at least once in the sea. I have a little "test" list on a laminated card that ensures I go through all the situations that I might need to work with when shooting for real.
Regards
Peter