Usually lenses are sharper at f/8 to f/11, beyond that you get diffraction due to small aperture, before that you get lack of DOF.
Not sure if it is the haze or lack of DOF, since you have after all used f/2.8, which is a pretty large aperture. However at super wide angles sometimes you can afford it. 24mm after crop factor or before? I'm guessing before, because I got a wider view
in my picture than you did.
I see you were trying to capture the light show's lights, but I think either you'd have to go more than once and work really hard to remember which part has the correct light arrangement you want, or get something not here-not-there like you have. I'd prefer to shift more to the left from your vantage point, use f/8 to f/11, lowest ISO possible, and slightly overexpose or expose just right. With that sort of setting you'd get all the ripples relatively smoothed out, which would look better, in my view.
I'm talking about #1 only, btw. =)