Yep...send it straight to Glock. Don't go through you dealer unless you know he is particulary adept at that sort of thing...most don't like to bother since you can. Send nothing but the gun itself. I find that when you do they sometimes send back a mag for your trouble, maybe a nice box, etc.
I have never had to deal with Glock CS (I have 3) but S&W always threw something in.
They will make it right. The Gen 4 is new and maybe they have some issues with that area...issues they probably have already fixed and from which you can benefit. We all get that sick feeling when something is bad like that but so far, I have always gotten satisfaction...guns, cars, shoes, etc, etc, etc...