I can't say that I have fixed it as the Sh**ks still pop up every now and again, but I think that's just because I don't focus on what I need to be doing.
What I focus on is keeping my right elbow pushing in towards my left arm during the backswing, this helps prevent it from lifting and flaring way behind me which pushes my right hand forward while my left hand is trying to go back. When I do this correctly my right elbow is in the proper position for my downswing. This also helps the right shoulder to actually turn back instead of pushing forward. And lastly I try to keep my right hand flat, like holding a tray or pizza at the top of my swing. The toe of the club is a little open compared to how it should be when the club is parallel to the ground on the backswing, but it's the only way, as of now, that helps prevent it.
For your grip, I would look around the site as there are a couple good threads on how to properly grip the club. Best way is to lift the club off of the ground while you're gripping it, this has helped me to prevent the clubface being closed.
Hopefully that makes sense?