Sorry about your Oly5060. Looks like you outlived my Oly C4000
The price dif between the G11 and G12 is very small from what I can see. I would go with the newer technology in the G12. The Canon housing is the same for both.
You stated you don't use an external strobe and IMO that rules out the G11 or G12 because the housing lens tunnel obstructs the internal strobe. This is due to the zoom length of the lens. You will have dark areas on the bottom right of your close-up macro shots unless you use techniques to outsmart the camera such as backing away from the subject and/or placing the subject in the upper left of the photo. Then cropping the photo in post processing.
You are better off with a Canon S95. It can do just about all the G11 and G12 can do. It has less zoom which you don't need underwater so it has a shorter housing lens tunnel. Not to say that allows you to get real close but a lot closer than with a G camera. It has a 2.0 lens over the 2.8 on the G11 and 12 so much more available light on non-strobe shots at deeper depths.
Take a look at the lens tunnel length differences and you can see why the on-board strobe is more obstructed on the G cameras. The supplied diffuser is not going to solve the issue. A G10 housing is in the photo but the 11/12 are the same size.
If you are going to add wet mount lenses at some future date consider the Ikelite housing for the S95 as it has a 67mm threaded lens port which accepts both wide angle and macro lenses. The
Ike housing is about $150.00 more than the Canon housing.
Take note that there is a dial on the rear of the S90/S95 cameras as well as the G11/12. Neither the Canon or Ike S90/S95 housings have a control for that dial. You have to push buttons to compensate. The Ike G11 housing does have the dial control.
You have to go to a higher priced housing like the FIX to get the dial control on the "S" model housing. They do not have an S95 housing yet, only the S90. Basic difference is HD Video on the S95.