As mentioned, the box appears to be wired properly at first glance.
I do not like the use of the RED wire as a ground. At the minimum it should be clearly marked with GREEN tape, and even...
Also, as mentioned, the shocks could have been from a poor connection or improper grounding. It is fixed, but it would have been nice for the electrician to tell you what was wrong (he likely hemmed and hawed, as to not admit his guy made a mistake).
To be clear (for the others reading along):
There should be 4 wires coming from the main panel.
2 HOTS (Black and Red), 1 NEUTRAL (White) and 1 Ground (green or bare). The NEUTRAL bus in the new subpanel (in the fishroom) MUST NOT be bonded (touching) the metal (GROUND) in the subpanel. The panel does not (and should not) have its own ground. It should be grounded back to the main service panel.
Your panel appears to be wired correctly
