About grounding the water of the aquarium. I think that it might be a good idea. But for safety you could use a resistor of about 1M ohm between the water and the ground. Use a large (long) resistor or use two resistors of 1M in series. The will avoid a static charge to build up.