Sorry about your rough trip. Here are my guidelines for passing through the CCC:

1. Never, ever go through either way on a weekend. Large sport fish go through there blithely ignoring the 10 mph speed limit and create large standing waves in the land cut.
2. Never go west late in the afternoon with a southerly. Duck into Sandwich or Onset and go through the following morning. The tide change and current works equally well late in the afternoon or in the morning, but the wind will be down in the morning.
3. Best time to go through the canal is on the night watch. Beautiful, calm, and very enjoyable.
4. Close all your hatches. One time we were headed East when a USN destroyer came through with a big bell on against the current (we were going with the current) and soaked our forepeak through an open hatch.
5. Always call Canal Control on 13 going in and ask about commercial traffic, and the railroad bridge operations. I got caught once behind a lowered railroad bridge and had to back and fill in a 4 knot current for about 30 minutes. Not fun.
6. When a 20 kt sport fish goes by do get his name and do call canal control and drop a dime on him. Sometimes they will pull him over. Sometimes not.
7. Obviously, do go through with the current. I felt I had to saty this because I have seen quite a few sailboats bucking the current over the years.

And finally, do enjoy the transit as it is unique and beautiful.