This has been a really useful debate, thank you all. I currently have a NEX6 which I have been wanting to upgrade for some time; and given the series of delays in announcing the A6000 replacement, I am now seriously looking at the full frame option. So if I were to agree (which I don't) with DKO's view of Sony's inability to get things right, it would be over that delay issue.
The cost of the A7Rii frankly scares me, as does the thought of trying to justify it to my long suffering (non diving) wife, and so I am encouraged by the views expressed in this debate about the A7ii. My list of "wants" includes size/weight, fast autofocus, and fast flash sync speed, and the A7ii looks like it does all of those.
As to stabilisation (and associated battery issues), I have never been persuaded of its merits for underwater photography, and I expect I would turn it off all the time. I see the comments about the 16-35 benefiting from stabilisation, but the equivalent 10-18 (which also has OSS) is actually my least used lens on the NEX6, and so I don't think stabilisation would be a huge issue for me. My most used is the 16mm with fisheye converter, which has always served me well, with no significant corner-sharpness issues - so I feel safe to assume that the 28mm plus converter would do just as well. It would be nice to try the Canon fisheye zoom, but the added port size/weight would be a deal breaker for me.
After the fisheye, my next-most used lens is the 50mm Zeiss macro, which I have not found to be ideal for underwater use: it tends to hunt on occasion, and won't take the SMC (so Alex T tells me). So the 90mm macro is a real selling point for the A7, and from reviews (including Phil's), it seems to be a cracker.
Thanks again for all the helpful comments, even though I'm a late joiner to this thread.