Randy,
I recall Winged Foot did some bunker drainage work about 20-years ago under something called the Alonzi Method; the super at the time if I recall correctly. They cut drainage trenches into the face of the bunkers so the water had somewhere to move vertically after working through the sand.
The Pacific North West is a bugger with the amount of winter rainfall. I know of a course an east coast architect had done, with large amoeba shaped bunkers with local sand that has the percolation rate of concrete; they are a bitch to maintain during the monsoon season, and they simply let them go during those months, and have a local rule of lift clean place. When the washouts become too much, the crew heads out to shovel up sand.
Perhaps the solution is to do the same during the wet months?