help choosing a new P&S and case

[uniqueimaging]

Okay, well heres the deal. I have a Sony DSC-P1 that I have been using underwater for years with a Sea&Sea housing. I am looking to upgrade my P&S camera for something more compact with more mexapixels. I use a Sea&Sea YS-25 flash with the fiber-optic system. I would like to retain that flash system, but upgrade my camera and housing. I'd like to spend around $200-300 on the camera and the same price on the housing if possible. I have been looking at the Sony w55, and the canon sd630 with their respective ikelite housings. Are either of these viable options, or is there anything else you could recommend. please help me!

Thanks,
-Mike

Ps. if this is in the wrong place.. please feel free to move it. I am new here.