I agree with Jim (have you noticed there are far too many jims on this forum
) that your new image is a major improvement in terms of color and contrast. Nice job.
As for composition, I don't personally like to question somebody else's vision. If that's they way you saw it, then I like to see whether or not it works for me. I understand that there are two focal points in the image but since I like them both I'm OK with it. I really don't know how I'd crop it otherwise 'cuz I really wouldn't want to lose that sky.
I like it. It works for me. Makes me want to go there for sure.