Update - on my way back from Australia right now. S90 was great on land and underwater!! Left my D300 and lenses at home, didn't regret it one bit. :) 36,000 ft above the midwest right now, cant wait to upload some pics when I hit home!!
Also got the Fix Fisheye as well, which did a great job.