Great capture. I deal with a lot of the refraction issues as most of my shooting is at night, and Ive learned to just accept it as part of night shooting. Jumping around in f stops helps, but I just don't get too in depth in post (stacking, hdr, layering etc) to worry about it too much.
I think both of your captures are great.