Try reverting the change to CheckOrigin. This really should mimic what is being done for HTTP connections in the server.go file (see ServeHTTP where there is the check for Origin header).
We had the same problem recently and reverting this change fixed our web socket issues.