Thomas: your setup sounds perfect. Focus light is "important" for macro, but only just so.
BTW: if funds are an issue, you can forgo the gears for your 12-50, since you "can" use the underwater scene mode to select a gross choice of zoom. This isn't perfect, but the money may be better spent elsewhere, or on a dedicated macro lens.
