Bent
Your issue of the wet connectors is something Ive seen with pretty much any manufacturer who uses them...hence the reason Light and Motion recently (after many years) did away with wet connectors on all of the Sunray Lights.
Now, with regards to your options for lighting, both the Green Force and Light and Motion lights are good, but it is important to note, they are VERY different lights. That being said, there are some personal questions you need to answer for your self based on the differences listed below, so you can choose a set to fit your needs. Are you shooting with the SWP44c port?
For the info below, comparing the Sunray 2000x and Squid 250 HID lights would be the equivalent options.
1. LED (Sunray) vs HID (Green Force). The Sunrays have a color temp of approx 6500-6800k where as the Squids are 3800k. Many shooters prefer warmer color temps (GF) lights over the cooler LED color temp.
2. Size. The Sunray lights are significantly smaller than the GF lights, which is a positive for those. However, the GF system is bulletproof, to go along with the bulletproofness of the Gates housing so if you are looking for a system to take a beating, the GFs match up with the Gates standard.
3. Cost, they are basically identical, so not really a factor.
4. Burn time: The Sunray 2000x lights are an hour burn at full power. The Squid 250 lights are approx an hour with the FIIHC batteries, or 100 minutes with the FIII batteries, which is very nice! The FIII batteries are definitely larger and heavier, but Ive worked out some nice solutions which make that issue irrelevant and your system will glide through the water with ease.
With regards to self-contained lighting, there just is not anything that is sufficient for use with the EX1/EX1r caliber systems at this point. For smaller systems, there are some acceptable units, but still nothing great. The need for power makes the self-contained systems too large and heavy for mounting up top.
Some questions I have for you to help better guide you are the following:
1. What is your purpose (broadcast, personal, documentaries, etc)?
2. Do you have any preference in color temperature?
3. What means more to you, size and weight or battery life and durability?
4. Are you shooting with the SWP44c?
Personally, I shoot both sets of lights. Some producers prefer one color temp over the other. If Im really tight on space and weight, I take the Sunrays. If Im going to spend a lot of time in the water and do not want to worry about burn time, I take the Squids.
I look forward to helping you further. Please let me know if you have any further questions.